[Libreoffice-commits] .: 3 commits - RepositoryFixes.mk solenv/gbuild

[Tor Lillqvist]

 RepositoryFixes.mk                |    9 +++++++++
 solenv/gbuild/platform/android.mk |    3 +++
 solenv/gbuild/platform/unxgcc.mk  |    2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1c6cd23b4fcd3910676b46cac4c42f3399311a83
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 4 21:15:34 2011 +0300

    Map also static LINKED_LIBS into -l option syntax

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a4797f5..d2517af 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -266,7 +266,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
 		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
-		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
+		$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
 		-o $(1))
 endef
 
commit 00ff044d61dba86863dbcccc8981e92e235f5662
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 4 21:13:55 2011 +0300

    We can't run any cppunit tests for Android
    
    Obviously we do want to eventually have some kind of testing
    framework, perhaps indeed running "normal" cppunit tests in the
    emulator, or something different. But for now just bypass it.

diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index f2ae9c4..09ac562 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -35,6 +35,9 @@ gb_CFLAGS += -fno-omit-frame-pointer
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+# No unit testing can be run
+gb_CppunitTest_CPPTESTPRECOMMAND := :
+
 # Set the proper enirotment variable so that our BUILD platform
 # build-time shared libraries are found.
 ifeq ($(OS_FOR_BUILD),MACOSX)
commit 7488284dd2256df2a884f05d3f4e81e3a92b4c19
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 4 21:11:36 2011 +0300

    Some libraries get built as static archives for Android
    
    We haven't bothered fixing their configury to recognize that shared
    libraries can be built for the platform. So for them use the .a names
    in gb_Library_FILENAMES for Android.

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2d9916f..d078354 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -144,6 +144,15 @@ gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salh
 
 endif
 
+# Some external libraries get built as static libraries for Android
+# because we haven't bothered fixing their configury to recognize that
+# shared libraries can be built for the platform.
+ifeq ($(OS),ANDROID)
+gb_Library_FILENAMES := $(patsubst cppunit:%.so,cppunit:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:%.so,xml2:%.a,$(gb_Library_FILENAMES))
+
+endif
+
 gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
 
 # we do not require a known rule for these, when using system libs