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

ruby-changes:56336

From: Nobuyoshi <ko1@a...>
Date: Tue, 2 Jul 2019 09:45:48 +0900 (JST)
Subject: [ruby-changes:56336] Nobuyoshi Nakada: 580b7600c7 (master): Substitute autoconf variables by prereq.status

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

From 580b7600c726c5293351e695bf6cf50339ef939b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 2 Jul 2019 09:44:37 +0900
Subject: Substitute autoconf variables by prereq.status


diff --git a/defs/gmake.mk b/defs/gmake.mk
index 738c8e3..1676227 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -150,7 +150,7 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L150
 	+$(Q) \
 	{ \
 	  $(CHDIR) "$(srcdir)"; \
-	  sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk template/Makefile.in; \
+	  sed -f tool/prereq.status defs/gmake.mk template/Makefile.in; \
 	  sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \
 	} | \
 	$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
diff --git a/tool/prereq.status b/tool/prereq.status
index e29aec7..6de00c8 100644
--- a/tool/prereq.status
+++ b/tool/prereq.status
@@ -13,6 +13,7 @@ s,@CP@,cp,g https://github.com/ruby/ruby/blob/trunk/tool/prereq.status#L13
 s,@CPPFLAGS@,,g
 s,@CXXFLAGS@,,g
 s,@DLDFLAGS@,,g
+s,@DTRACE_EXT@,dmyh,g
 s,@EXEEXT@,,g
 s,@HAVE_BASERUBY@,yes,g
 s,@IFCHANGE@,tool/ifchange,g
-- 
cgit v0.10.2


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

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