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

ruby-changes:41412

From: nobu <ko1@a...>
Date: Sat, 9 Jan 2016 17:49:40 +0900 (JST)
Subject: [ruby-changes:41412] nobu:r53484 (trunk): nmake VPATH

nobu	2016-01-09 17:49:56 +0900 (Sat, 09 Jan 2016)

  New Revision: 53484

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

  Log:
    nmake VPATH
    
    * ext/rbconfig/sizeof/depend (sizes.c): add nmake VPATH prefix.
      reapply r53482 with '#' as separator not to be removed in
      make-snapshot.

  Modified files:
    trunk/common.mk
    trunk/ext/rbconfig/sizeof/depend
Index: ext/rbconfig/sizeof/depend
===================================================================
--- ext/rbconfig/sizeof/depend	(revision 53483)
+++ ext/rbconfig/sizeof/depend	(revision 53484)
@@ -1,4 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/rbconfig/sizeof/depend#L1
-sizes.c: $(top_srcdir)/tool/generic_erb.rb $(top_srcdir)/template/sizes.c.tmpl $(top_srcdir)/configure.in $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
+{$(VPATH)}sizes.c: $(top_srcdir)/tool/generic_erb.rb \
+		   $(top_srcdir)/template/sizes.c.tmpl \
+		   $(top_srcdir)/configure.in \
+		   $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
 	$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
 		$(top_srcdir)/template/sizes.c.tmpl \
                 $(top_srcdir)/configure.in \
Index: common.mk
===================================================================
--- common.mk	(revision 53483)
+++ common.mk	(revision 53484)
@@ -887,7 +887,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $ https://github.com/ruby/ruby/blob/trunk/common.mk#L887
 		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
+	sed '/AUTOGENERATED/q;s#{.*}##' depend | \
 	$(exec) $(MAKE) -f - $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
 

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

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