diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:18:26 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:18:26 +0900 |
| commit | 000cb2241425a6f073066bd6acc56190b361f9e8 (patch) | |
| tree | 1214db8f52f90e9eb8e93ecee31aab333e09d0fe | |
| parent | 905a1eb690f86bc6c711b16e2f52bfb6d45e9d4c (diff) | |
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(-)
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | template/Makefile.in | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 3 insertions, 8 deletions
@@ -845,6 +845,8 @@ extconf: $(PREP) $(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 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 \ $(ECHO) generating $@ $(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@ -verconf.h: $(RBCONFIG) loadpath: verconf.h @$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \ @@ -11,7 +11,7 @@ # 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: -$(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) \ |