From d8aa986b134105edb24fa6843fbf5e8dda02b61d Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 16 Jun 2011 14:07:53 +0300
Subject: Do build libccppunit when cross-compiling after all

Makes it easier to build other stuff. Whether we will actually run
normal unit tests at build time, or ever, or not when cross-compiling
to some platform is a different matter...
---
 cppunit/makefile.mk | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'cppunit')

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 4315adf8c9f7..3974f96c345d 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,8 +40,6 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
     #  aid=2912630&group_id=11795&atid=311795>
 
-.IF "$(CROSS_COMPILING)"!="YES"
-
 .IF "$(OS)" == "WNT"
 .IF "$(COM)" == "MSC"
 
@@ -66,6 +64,12 @@ BUILD_ACTION = cd src/cppunit && dmake -f ooo-cppunit_dll.mk debug=$(debug) verb
 
 OUTDIR2INC = include/cppunit
 
+.INCLUDE: set_ext.mk
+.INCLUDE: target.mk
+.INCLUDE: tg_ext.mk
+
+$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
+
 .ELSE
 .IF "$(COM)" == "GCC"
 EXTRA_CFLAGS += -mthreads
@@ -89,6 +93,10 @@ 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
+.INCLUDE: tg_ext.mk
+
 .ENDIF # "$(COM)" == "GCC"
 .ENDIF # "$(COM)" == "MSC"
 
@@ -111,6 +119,16 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
     LDFLAGS='$(LDFLAGS)' \
     LIBS='$(MY_LIBS)'
 
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS+=--disable-shared
+.ELSE
+CONFIGURE_FLAGS+=--disable-static
+.ENDIF
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
@@ -124,17 +142,14 @@ EXTRPATH = NONE
 OUT2LIB = ooo-install/lib/libcppunit-1.12.a
 .ELIF "$(OS)" == "OPENBSD"
 OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0
+.ELIF "$(OS)" == "IOS"
+OUT2LIB = ooo-install/lib/libcppunit.a
 .ELSE
 OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
 .END
 
-.END
-.ENDIF
-
 .INCLUDE: set_ext.mk
 .INCLUDE: target.mk
 .INCLUDE: tg_ext.mk
 
-.IF "$(COM)" == "MSC"
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
-.ENDIF
+.END
-- 
cgit