[Libreoffice-commits] .: 2 commits - cppu/qa io/prj

[Tor Lillqvist]

 cppu/qa/makefile.mk |    7 ++++++-
 io/prj/build.lst    |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 715c63f8a1b7dec03e6a2d7b1bdf305c027bbca0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Sep 13 11:33:53 2011 +0300

    Depend explicitly on cppuhelper for the non-DESKTOP case

diff --git a/io/prj/build.lst b/io/prj/build.lst
index eab94bf..4d54cc5 100644
--- a/io/prj/build.lst
+++ b/io/prj/build.lst
@@ -1,4 +1,4 @@
-io	io	: LIBXSLT:libxslt DESKTOP:rdbmaker NULL
+io	io	: LIBXSLT:libxslt DESKTOP:rdbmaker cppuhelper NULL
 io	io										usr1	-	all	io_mkout NULL
 io	io\inc									nmake	-	all	io_inc NULL
 io	io\source\acceptor						nmake	-	all	io_acceptor io_connector io_inc NULL
commit 1c69052b5218448e91813eb2ad1e60820639b300
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Sep 13 11:30:58 2011 +0300

    Bypass building the iOS cppu_unittester_all for now
    
    We can't build it here at this point during the build after all. We
    use static linking on iOS, and we would need to link with -lgcc3_uno
    from bridges which has not been built yet. It seems that any
    meaningful unit tests for iOS actually need to be built in a
    "subsequent" stage.

diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 9d3d5c2..2dee991 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -73,7 +73,12 @@ DEF4NAME = $(SHL4TARGET)
 
 SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
 
-.IF "$(OS)" == "IOS"
+.IF "$(OS)" == "IOS no thanks for now" 
+# Nah, we can't build this here for iOS after all, thanks to having to
+# use static linking, we would need to link with -lgcc3_uno from
+# bridges which has not been built yet (and which in fact depends on
+# cppu...) Seems that any meaningful unit test for iOS actually needs
+# to be built in the "subsequent" stage.
 APP5OBJS = $(OBJ)/cppu_cppunittester_all.obj $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS)
 APP5RPATH = NONE
 APP5STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB)