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

ruby-changes:42678

From: naruse <ko1@a...>
Date: Sun, 24 Apr 2016 23:11:48 +0900 (JST)
Subject: [ruby-changes:42678] naruse:r54752 (trunk): Revert "common.mk: timestamp file for verconf.h"

naruse	2016-04-25 00:08:25 +0900 (Mon, 25 Apr 2016)

  New Revision: 54752

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

  Log:
    Revert "common.mk: timestamp file for verconf.h"
    
    This reverts commit r54748.
    It breaks build.
    http://www.rubyist.net/~akr/chkbuild/debian/ruby-trunk/log/20160424T120700Z.log.html.gz

  Modified files:
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 54751)
+++ common.mk	(revision 54752)
@@ -623,7 +623,7 @@ extconf: $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L623
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
+$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
 	$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
 		-cross_compiling=$(CROSS_COMPILING) \
 		-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
@@ -748,11 +748,9 @@ $(NEWLINE_C): $(srcdir)/enc/trans/newlin https://github.com/ruby/ruby/blob/trunk/common.mk#L748
 	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
 enc/trans/newline.$(OBJEXT): $(NEWLINE_C)
 
-VERCONF_H = ./.time.verconf.h
-
-$(VERCONF_H): $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(PREP)
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
 	$(ECHO) creating $@
-	$(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -c -t -o verconf.h $(srcdir)/template/verconf.h.tmpl
+	$(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
 
 ruby-glommed.$(OBJEXT): $(OBJS)
 

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

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