From 65ad69352a30353b8800a2f70874806cf137c42b Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 21 Jun 2010 17:14:15 +0200 Subject: sb126: #i111141# patch the file that is actually used --- cppunit/ldflags.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'cppunit') diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch index cecd69a4b5ee..ee8d5ed897ce 100644 --- a/cppunit/ldflags.patch +++ b/cppunit/ldflags.patch @@ -1,10 +1,11 @@ ---- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008 -+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010 -@@ -63,5 +63,6 @@ +--- misc/cppunit-1.12.1/src/cppunit/Makefile.in 2008-02-20 06:59:55.000000000 +0100 ++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2010-06-21 17:01:38.324370072 +0200 +@@ -300,7 +300,7 @@ - libcppunit_la_LDFLAGS= \ + libcppunit_la_LDFLAGS = \ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -release $(LT_RELEASE) \ -+ @LIBADD_DL@ ++ -release $(LT_RELEASE) $(LIBADD_DL) + + all: all-am -- cgit From 39565fee52df09b79977bb2c14e4bdc84b722d52 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 20 Jul 2010 12:46:55 +0200 Subject: #i107097# - pass MAXPROCESS to GNU make in external modules --- cppunit/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cppunit') diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index f50f4aadc164..9441e9219483 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ 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 @@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ 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 -- cgit From 5497dad8f1c77a44c1289ced5e50bd2e207fcb83 Mon Sep 17 00:00:00 2001 From: Takashi Ono Date: Thu, 3 Feb 2011 10:02:58 +0100 Subject: CWS gnumake3: adapt mingw port to new features in cws --- cppunit/makefile.mk | 1 + cppunit/prj/d.lst | 1 + 2 files changed, 2 insertions(+) (limited to 'cppunit') diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 9441e9219483..043ce740655d 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -104,6 +104,7 @@ OUTDIR2INC = ooo-install/include/cppunit OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ ooo-install/bin/cygcppunit-1-12-1.dll +OUT2LIB = ooo-install/lib/libcppunit.dll.a .INCLUDE: set_ext.mk .INCLUDE: target.mk diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 6ecac46bfb90..fb7c1195fc0a 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -17,6 +17,7 @@ mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text ..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib ..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll +..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a ..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib -- cgit