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

ruby-changes:52041

From: nobu <ko1@a...>
Date: Thu, 9 Aug 2018 22:32:56 +0900 (JST)
Subject: [ruby-changes:52041] nobu:r64257 (trunk): gmake.mk: fix commit dependency

nobu	2018-08-09 22:32:49 +0900 (Thu, 09 Aug 2018)

  New Revision: 64257

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64257

  Log:
    gmake.mk: fix commit dependency
    
    * defs/gmake.mk (commit): pass CONFIGURE and fix dependency of
      `reconfig` target, not to try to make config.status newer than
      the source directory.  and remove configure_args in common.mk,
      which is a garbage argument.

  Modified files:
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 64256)
+++ defs/gmake.mk	(revision 64257)
@@ -142,12 +142,12 @@ commit: $(if $(filter commit,$(MAKECMDGO https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L142
 	+$(Q) \
 	{ \
 	  cd "$(srcdir)"; \
-	  sed 's/^@.*@$$//;s/@[A-Z][A-Z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \
+	  sed 's/^@.*@$$//;s/@[A-Za-z_][A-Za-z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \
 	  sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \
 	} | \
 	$(MAKE) $(mflags) Q=$(Q) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \
 		BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \
-		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY -f - \
+		VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
 		update-src srcs all-incs
 
 ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)

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

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