[Libreoffice-commits] .: 2 commits - fontconfig/ExternalProject_fontconfig.mk solenv/gbuild

[Libreoffice Gerrit user]

 fontconfig/ExternalProject_fontconfig.mk |    2 +-
 solenv/gbuild/platform/android.mk        |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cbe020b979e841b3bfc6da1b324fd02f1b9390d8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 29 14:28:26 2012 +0200

    Need -lm for Android for the exectuables that fontconfig builds
    
    Said executables will not be used for anything, of course.
    
    We can't use gb_STDLIBS, which also contains -lm after my previous
    commit, as fontconfig is C, not C++, and gb_STDLIBS contains
    -lgnustl_static, and only our $(CXX), not $(CC), contains the -L that
    points to where -lgnustl_static is to be found.
    
    Change-Id: I40c459580f357d913ddc55eae00e16f90f81d510

diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index b7d2eb5..90107a1 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\
 
 $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 	cd $(EXTERNAL_WORKDIR) \
-	&& $(if $(debug),CFLAGS=-g) ./configure \
+	&& $(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS="-lm $(LIBS)") ./configure \
 		--disable-shared \
 		--with-arch=arm \
 		--with-expat-includes=$(OUTDIR)/inc/external \
commit 6db0190b716e36e33dbbef0c9a40750ce53b94dd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 29 14:28:12 2012 +0200

    Use also -lm to be on the safe side
    
    Change-Id: I2bee6cc4f985ee47dbe4d2e35acf688042970519

diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 804d939..2c33f1b 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -10,7 +10,8 @@
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 # Link with -lgnustl_static
 gb_STDLIBS := \
-	-lgnustl_static
+	-lgnustl_static \
+	-lm
 
 gb_Library_PLAINLIBS_NONE := \
 	android \