[Libreoffice-commits] .: 3 commits - cppunit/makefile.mk cppunit/prj icc/makefile.mk

[Tor Lillqvist]

 cppunit/makefile.mk |   31 +++++++++++++++++++++++--------
 cppunit/prj/d.lst   |    2 ++
 icc/makefile.mk     |   11 +++++------
 3 files changed, 30 insertions(+), 14 deletions(-)

New commits:
commit 04b1b50820fd81baeb3404c388af56d1e5777c95
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 16 21:03:05 2011 +0300

    Deliver also static libcppunit if built in that way

diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 28b7095..a2efb6b 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -31,6 +31,8 @@ symlink: %_DEST%\lib\libcppunit-1.12.so.1.0 %_DEST%\lib\libcppunit.so
 ..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit-1.12.a
 symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a
 
+..\%__SRC%\lib\libcppunit.a %_DEST%\lib\libcppunit.a
+
 ..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
 ..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
 ..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
commit 77e0353a6dfda54facc353abdf9d54313a8f4afb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 16 14:07:53 2011 +0300

    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...

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 4315adf..3974f96 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
commit 110f3569ff1293eec02c32b1287889106e394cab
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 16 02:37:30 2011 +0300

    "Build" the  sRGB header also when cross-compiling

diff --git a/icc/makefile.mk b/icc/makefile.mk
index f9e0622..779def4 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -34,11 +34,6 @@ TARGET=icc
 
 .INCLUDE :	settings.mk
 
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=SampleICC-1.3.2
@@ -53,13 +48,17 @@ CONVERTFILES= \
     Contrib$/ICC_utils$/Stubs.h \
     Contrib$/ICC_utils$/Vetters.cpp
 
+.IF "$(CROSS_COMPILING)"!="YES"
 CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip
 BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
+.ELSE
+CONFIGURE_ACTION= 
+BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf -
+.ENDIF
 
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	set_ext.mk
-
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk