diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-17 09:21:11 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-17 09:21:11 +0100 |
| commit | ff5a80024aab426d03394ad0b4da8067028097ff (patch) | |
| tree | 319053b7599a90ca18b3a2189b54578347557f32 /icu | |
| parent | 9865a0d430da8948210a2cd9d4bae08e6023f4c8 (diff) | |
fix icu parallel build
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-parallel-buid.patch | 20 | ||||
| -rw-r--r-- | icu/makefile.mk | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/icu/icu4c-parallel-buid.patch b/icu/icu4c-parallel-buid.patch new file mode 100644 index 000000000000..3f338693bc95 --- /dev/null +++ b/icu/icu4c-parallel-buid.patch @@ -0,0 +1,20 @@ +--- misc/build/icu/source/extra/uconv/Makefile.in.sav 2010-09-29 20:37:14.000000000 +0200 ++++ misc/build/icu/source/extra/uconv/Makefile.in 2011-10-19 01:12:22.000000000 +0200 +@@ -147,7 +147,7 @@ $(UCONVMSG_LIB): resfiles + endif + + +-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc ++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc + $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst + + $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk +@@ -159,7 +159,7 @@ $(RESDIR)/$(RESDIR).lst: Makefile $(srcd + + # no install for static mode + ifneq ($(UCONVMSG_MODE),static) +-install-resfiles: $(RESFILES) ++install-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc + $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR) + $(INVOKE) $(TOOLBINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst + else diff --git a/icu/makefile.mk b/icu/makefile.mk index b906d427fc79..eb32cc871b48 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -54,7 +54,8 @@ PATCH_FILES=\ icu4c-escapespace.patch \ icu4c-strict-c.patch \ CVE-2011-4599.patch \ - arm-assembler.patch + arm-assembler.patch \ + icu4c-parallel-buid.patch .IF "$(OS)"=="ANDROID" PATCH_FILES+=\ |