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

ruby-changes:70055

From: Nobuyoshi <ko1@a...>
Date: Sat, 4 Dec 2021 16:29:11 +0900 (JST)
Subject: [ruby-changes:70055] 4a6ca12904 (master): Remove unversioned phony target for pkgconfig file [Bug #18374]

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

From 4a6ca12904c8160d68ac4b552636159926afff41 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 4 Dec 2021 16:20:30 +0900
Subject: Remove unversioned phony target for pkgconfig file [Bug #18374]

It results in a circular dependency when `--with-ruby-pc=ruby.pc`
is given.  [ci skip]
---
 defs/gmake.mk        | 2 ++
 template/Makefile.in | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defs/gmake.mk b/defs/gmake.mk
index 0b17bfb16f0..dd7da5f7707 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -424,3 +424,5 @@ endif https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L424
 
 spec/%/ spec/%_spec.rb: programs exts PHONY
 	+$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@)
+
+ruby.pc: $(filter-out ruby.pc,$(ruby_pc))
diff --git a/template/Makefile.in b/template/Makefile.in
index 445f14ebdd3..9e6d6fe0e36 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -318,7 +318,6 @@ $(LIBRUBY_$(LIBRUBY_WITH_EXT)): $(LIBRUBY_SO_UPDATE) https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L318
 
 PKG_CONFIG = @PKG_CONFIG@
 ruby_pc = @ruby_pc@
-ruby.pc: $(ruby_pc)
 $(ruby_pc): config.status Makefile
 	$(Q)./config.status --file=-:$(srcdir)/template/ruby.pc.in | \
 	sed -e 's/\$$(\([A-Za-z_][A-Za-z0-9_]*\))/$${\1}/g' \
-- 
cgit v1.2.1


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

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