[Libreoffice-commits] .: 3 commits - hunspell/ExternalProject_hunspell.mk mythes/ExternalProject_mythes.mk solenv/gbuild

[Libreoffice Gerrit user]

 hunspell/ExternalProject_hunspell.mk |    2 +-
 mythes/ExternalProject_mythes.mk     |    2 +-
 solenv/gbuild/platform/android.mk    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

    Need gb_STDLIBS for mythes, too
    
    Change-Id: I8ee685fa36f922a391802ac0de69f5cab2d69b6c

diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index b146823..392e69d 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,mythes,\
 
 $(call gb_ExternalProject_get_state_target,mythes,build):
 	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure --disable-shared --with-pic \
+	&& LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
 	HUNSPELL_CFLAGS=" $(HUNSPELL_CFLAGS)" \
 	HUNSPELL_LIBS=" $(HUNSPELL_LIBS)" \
commit 0ac7d3a1da9a573840897eb7dc64cb425a3d2170
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 29 14:13:46 2012 +0200

    gb_STDLIBS already has the -l options
    
    Change-Id: Ic498efe935194e95c593c5378d882664b7ad14ef

diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk
index f2eaf7c..91cf31c 100644
--- a/hunspell/ExternalProject_hunspell.mk
+++ b/hunspell/ExternalProject_hunspell.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,hunspell,\
 
 $(call gb_ExternalProject_get_state_target,hunspell,build):
 	cd $(EXTERNAL_WORKDIR) \
-	&& LIBS="$(addprefix -l,$(gb_STDLIBS)) $(LIBS)" ./configure --disable-shared --disable-nls --with-pic \
+	&& LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --disable-nls --with-pic \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
 	$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
 	$(if $(filter C53,$(COM)),CFLAGS="-xc99=none") \
commit 87cac6bac2bd2145a5e41a3ce1ec1c2029ca010a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 29 14:13:15 2012 +0200

    gb_STDLIBS should contain -l options for the linking command line
    
    Change-Id: Iab93d5dc4b3c19d3661846b16956573078fa4cfd

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