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

ruby-changes:73390

From: Nobuyoshi <ko1@a...>
Date: Sat, 3 Sep 2022 19:22:29 +0900 (JST)
Subject: [ruby-changes:73390] bc5b9be1ee (master): Move duplicate dependencies

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

From bc5b9be1ee44817614bc8311e671fc79ca730625 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 2 Sep 2022 22:41:07 +0900
Subject: Move duplicate dependencies

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

diff --git a/common.mk b/common.mk
index 86226b58ca..b159436dae 100644
--- a/common.mk
+++ b/common.mk
@@ -839,6 +839,8 @@ extconf: $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L839
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
+rbconfig.rb: $(RBCONFIG)
+
 $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
 	$(Q)$(BOOTSTRAPRUBY) -n \
 	-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
diff --git a/template/Makefile.in b/template/Makefile.in
index facbf062f4..f60986a53f 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -355,10 +355,6 @@ pre-install-local:: pkgconfig-data https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L355
 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
@@ -671,7 +667,6 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L667
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@
 
-verconf.h: $(RBCONFIG)
 
 loadpath: verconf.h
 	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3de53d8372..bb9e12d3ca 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1211,8 +1211,6 @@ clean-enc distclean-enc realclean-enc: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1211
 	-$(Q)$(MAKE) $(MAKE_ENC) $(@:-enc=)
 !endif
 
-$(RBCONFIG): $(PREP)
-
 $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
-- 
cgit v1.2.1


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

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