From f72c0b5c787df88aedb0270d354e8dca9326ce45 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 23 Oct 2014 14:58:29 +0000 Subject: [PATCH] common.mk: timestamp for update-unicode * common.mk (.update-unicode.time): timestamp not to download same files twice at one build. [Bug #10415] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index d37a464486..40a227b047 100644 --- a/common.mk +++ b/common.mk @@ -182,7 +182,8 @@ $(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) configure-ext: $(EXTS_MK) build-ext: $(EXTS_MK) - $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)" $(EXTSTATIC) + $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ + ENCOBJS="$(ENCOBJS)" ALWAYS_UPDATE_UNICODE=no $(EXTSTATIC) prog: program wprogram @@ -1106,14 +1107,18 @@ UNICODE_FILES = $(srcdir)/enc/unicode/data/UnicodeData.txt \ $(srcdir)/enc/unicode/data/CompositionExclusions.txt \ $(srcdir)/enc/unicode/data/NormalizationTest.txt -$(UNICODE_FILES): update-unicode +update-unicode: $(UNICODE_FILES) PHONY +$(UNICODE_FILES): ./.update-unicode.time -update-unicode: PHONY +UPDATE_UNICODE_FILES_DEPS = $(ALWAYS_UPDATE_UNICODE:yes=PHONY) + +./.update-unicode.time: $(UPDATE_UNICODE_FILES_DEPS:no=) $(ECHO) Downloading Unicode data files... $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data" $(Q) $(BASERUBY) -C "$(srcdir)/enc/unicode/data" \ ../../../tool/downloader.rb -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt + @exit > .update-unicode.time $(srcdir)/lib/unicode_normalize/tables.rb: \ $(srcdir)/tool/unicode_norm_gen.rb $(UNICODE_FILES)