diff options
| author | obo <obo@openoffice.org> | 2010-07-29 13:49:01 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-07-29 13:49:01 +0200 |
| commit | 4ac99fac74b99c792110fb0bcbe2a641f48b28a3 (patch) | |
| tree | 581c08c4f34c3e24d2b545d940ec37a8e54e683a | |
| parent | af27bb9c4a23014927837c6c2eeb56fd6ccf8533 (diff) | |
| parent | d04b4bd3eb8143acb394dfa616ac6db4ba62adfa (diff) | |
CWS-TOOLING: integrate CWS ause124
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m86
| -rw-r--r-- | berkeleydb/makefile.mk | 2 | ||||
| -rw-r--r-- | hunspell/makefile.mk | 2 | ||||
| -rw-r--r-- | icu/icu-mp.patch | 24 | ||||
| -rw-r--r-- | icu/makefile.mk | 4 |
4 files changed, 28 insertions, 4 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 325e8700e7a8..0b6bbde381cb 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -107,7 +107,7 @@ CXXFLAGS+:=$(ARCH_FLAGS) BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) -BUILD_ACTION=make +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2INC= \ diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 253607ab0c0f..7b2bc84e0789 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -62,7 +62,7 @@ CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF -BUILD_ACTION=make && make check +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a 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 2fafcfa75e8d..92c5744a67f7 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= @@ -118,7 +118,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) \ |