diff options
| author | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
| commit | 6bc2155fd37574fbb2301326c96b8530b9c28d96 (patch) | |
| tree | 4a1baf30b6d4d2c92a2a2fe280d321a388cb4ea9 /icu | |
| parent | da1320efe152132d088042ae8857571113fad5e3 (diff) | |
| parent | 52dce173df6bbcc79126c63a7736ef3f6c21a706 (diff) | |
sb126: merged in DEV300_m87
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu-mp.patch | 24 | ||||
| -rw-r--r-- | icu/makefile.mk | 4 |
2 files changed, 26 insertions, 2 deletions
diff --git a/icu/icu-mp.patch b/icu/icu-mp.patch new file mode 100644 index 000000000000..10165427692a --- /dev/null +++ b/icu/icu-mp.patch @@ -0,0 +1,24 @@ +diff -ur misc/icu/source/data/Makefile.in misc/build/icu/source/data/Makefile.in +--- misc/icu/source/data/Makefile.in Mi Jul 21 12:19:00 2010 ++++ misc/build/icu/source/data/Makefile.in Mi Jul 21 12:20:58 2010 +@@ -77,7 +77,7 @@ + MISCSRCDIR=$(SRCDATADIR)/misc + UCMSRCDIR=$(SRCDATADIR)/mappings + COMINCDIR=$(top_srcdir)/common/unicode +-SRCLISTDEPS=Makefile $(srcdir)/Makefile.in ++SRCLISTDEPS=Makefile $(srcdir)/Makefile.in build-dir + BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(BUILDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE) + + # relative lib links from pkgdata are the same as for tmp +diff -ru misc/icu/source/data/Makefile.in misc/build/icu//source/data/Makefile.in +--- misc/icu/source/data/Makefile.in Do Jan 15 08:46:48 2009 ++++ misc/build/icu//source/data/Makefile.in Mi Jul 21 11:37:49 2010 +@@ -132,7 +132,7 @@ + # and convert it to the current type. + ifneq ($(ICUDATA_ARCHIVE),) + ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat +-$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR) ++$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) build-dir + $(INVOKE) $(BINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) + endif + else diff --git a/icu/makefile.mk b/icu/makefile.mk index d0181b1fe9b5..7542aeb1ccd1 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,7 +46,7 @@ TARFILE_MD5= .ENDIF TARFILE_ROOTDIR=icu -PATCH_FILES=${TARFILE_NAME}.patch +PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch # ADDITIONAL_FILES= @@ -113,7 +113,7 @@ CONFIGURE_FLAGS= # note the position of the single quotes. BUILD_DIR=$(CONFIGURE_DIR) -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) +BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \ |