From 7666ccdc9f90786a226b331c8a9c5254c42585d6 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 19 Dec 2015 15:10:19 +0000 Subject: [PATCH] icu: Add patch to fix race condition in parallel builds. The yearistype.sh script did not depend on the extraction of the tzdata archive. --- dev-libs/icu/patches/icu-55.1.patchset | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dev-libs/icu/patches/icu-55.1.patchset b/dev-libs/icu/patches/icu-55.1.patchset index 87f8559fc..406d099ce 100644 --- a/dev-libs/icu/patches/icu-55.1.patchset +++ b/dev-libs/icu/patches/icu-55.1.patchset @@ -172,3 +172,32 @@ index 89902b4..9f3b893 100644 2.2.2 +From 093540e0271aad6cc2aa23bfd8af1e37d04c5ef4 Mon Sep 17 00:00:00 2001 +From: Michael Lotz +Date: Sat, 19 Dec 2015 14:44:35 +0000 +Subject: [PATCH] Fix missing dependency of yearistype.sh to tzdata extraction. + +This caused parallel builds to fail because the script file wasn't yet +extracted when it was copied. The regression was introduced in r26995 +when the dependency was reused for TDATA which yearistype.sh isn't part +of. +--- + source/tools/tzcode/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/tools/tzcode/Makefile.in b/source/tools/tzcode/Makefile.in +index b6ec447..d97e485 100644 +--- a/source/tools/tzcode/Makefile.in ++++ b/source/tools/tzcode/Makefile.in +@@ -125,7 +125,7 @@ $(ICUZDUMPTARG): $(srcdir)/icuzdump.cpp + $(LINK.cc) -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/io -pedantic $(srcdir)/icuzdump.cpp $(LIBICUUC) $(LIBICUDT) $(LIBICUI18N) $(LIBICUIO) $(LIBICUTOOLUTIL) -o $@ + + +-$(TDATA): tdatamarker ++$(TDATA) $(XDATA): tdatamarker + + tdatamarker: $(TZDATA) + gunzip -d < $(TZDATA) | tar xf - --exclude=Makefile +-- +2.2.2 +