Commits

Anonymous committed ca9f00d Merge

CWS-TOOLING: integrate CWS ause124

  • Participants
  • Parent commits 5a89b95, 0d1f234

Comments (0)

Files changed (7)

File berkeleydb/makefile.mk

 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)
-BUILD_ACTION=make
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
 OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
 OUT2INC= \

File cppunit/makefile.mk

     LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
     LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
 
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
     LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
     LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
 
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit

File hunspell/makefile.mk

 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
 

File hyphen/makefile.mk

 @all:
 	echo "Nothing to do here."
 .ELSE
-BUILD_ACTION=make && make check
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 OUT2INC += hyphen.h 
 .ENDIF
 

File icu/icu-mp.patch

+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

File icu/makefile.mk

 .ENDIF
 TARFILE_ROOTDIR=icu
 
-PATCH_FILES=${TARFILE_NAME}.patch
+PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch
 
 # ADDITIONAL_FILES=
 
 # 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) \

File libxmlsec/makefile.mk

 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ELSE
 CONFIGURE_DIR=win32
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF