[前][次][番号順一覧][スレッド一覧]

ruby-changes:74174

From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 15:21:33 +0900 (JST)
Subject: [ruby-changes:74174] 000cb22414 (ruby_3_1): merge revision(s) bc5b9be1ee44817614bc8311e671fc79ca730625:

https://git.ruby-lang.org/ruby.git/commit/?id=000cb22414

From 000cb2241425a6f073066bd6acc56190b361f9e8 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 15:18:26 +0900
Subject: merge revision(s) bc5b9be1ee44817614bc8311e671fc79ca730625:

	Move duplicate dependencies

	---
	 common.mk            | 2 ++
	 template/Makefile.in | 5 -----
	 win32/Makefile.sub   | 2 --
	 3 files changed, 2 insertions(+), 7 deletions(-)
---
 common.mk            | 2 ++
 template/Makefile.in | 5 -----
 version.h            | 2 +-
 win32/Makefile.sub   | 2 --
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/common.mk b/common.mk
index db138fc7a3..499d9a91a7 100644
--- a/common.mk
+++ b/common.mk
@@ -845,6 +845,8 @@ extconf: $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L845
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
+rbconfig.rb: $(RBCONFIG)
+
 $(HAVE_BASERUBY:no=)$(RBCONFIG)$(HAVE_BASERUBY:no=): $(PREP)
 $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
 	$(Q)$(BOOTSTRAPRUBY) -n \
diff --git a/template/Makefile.in b/template/Makefile.in
index 787714a58b..2110d53ec1 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -334,10 +334,6 @@ pre-install-local:: pkgconfig-data https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L334
 ruby-runner.h: template/ruby-runner.h.in config.status
 		@./config.status --file=$@:$(srcdir)/template/$(@F).in
 
-$(RBCONFIG): $(PREP)
-
-rbconfig.rb: $(RBCONFIG)
-
 install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
 	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE) pkgconfig-data
 	$(ECHO) installing cross-compiling stuff
@@ -650,7 +646,6 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L646
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@
 
-verconf.h: $(RBCONFIG)
 
 loadpath: verconf.h
 	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
diff --git a/version.h b/version.h
index 201095545c..3fd87c0bdb 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 145
+#define RUBY_PATCHLEVEL 146
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 244725a016..b5d1179dc6 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1221,8 +1221,6 @@ clean-enc distclean-enc realclean-enc: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1221
 	-$(Q)$(MAKE) $(MAKE_ENC) $(@:-enc=)
 !endif
 
-$(RBCONFIG): $(PREP)
-
 $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]