[Libreoffice-commits] .: 4 commits - configure.in sal/Library_lo-bootstrap.mk solenv/gbuild

[Tor Lillqvist]

 configure.in                              |    1 +
 sal/Library_lo-bootstrap.mk               |    6 +++---
 solenv/gbuild/platform/ANDROID_ARM_GCC.mk |   12 ++++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit ba7d9c677a865ed3355d5c85673cafe4d4b30915
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 9 10:41:12 2012 +0200

    Should use gb_Library_add_libs and not gb_Library_add_linked_libs
    
    for system libs, says dtardon, and I trust him. Note that this crap
    still doesn't work any more for Android, though. Some problems with
    the gnustl_shared library. I have no idea where it needs to be
    mentioned for the bloody gbuild mechanism to understand what kind of
    library that is.

diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk
index a59ad5b..995f207 100644
--- a/sal/Library_lo-bootstrap.mk
+++ b/sal/Library_lo-bootstrap.mk
@@ -28,9 +28,9 @@
 $(eval $(call gb_Library_Library,lo-bootstrap))
 
 # We explicitly *don't* want gb_STDLIBS to be linked here
-$(eval $(call gb_Library_add_linked_libs,lo-bootstrap,\
-	log \
-	android \
+$(eval $(call gb_Library_add_libs,lo-bootstrap,\
+	-llog \
+	-landroid \
 ))
 
 $(eval $(call gb_Library_add_cobjects,lo-bootstrap,\
commit b2b5357097a8a61fe80fb4f57ade0965099f61a6
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 9 10:39:19 2012 +0200

    gb_Library_PLAINLIBS_NONE should not contain system libs, says dtardon

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index d9ed246..6f762ba 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -37,11 +37,6 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 gb_STDLIBS := \
 	gnustl_shared
 
-gb_Library_PLAINLIBS_NONE := \
-	android \
-	gnustl_shared \
-	log \
-
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 
commit f41d8090641495a94c0f1ee6cf450543179e9cb2
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 9 09:44:32 2012 +0200

    Reword comment to match reality better

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 309dc6a..d9ed246 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -45,9 +45,10 @@ gb_Library_PLAINLIBS_NONE := \
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 
-# Re-define this shebang from unxgcc.mk, adding -shared and -llog
-# -landroid Just temporarily done this way, shm_get promised to do
-# this in some more elegant fashion.
+# Re-define this from unxgcc.mk with some small but important
+# changes. Just temporarily done this way, shm_get promised to
+# eventually enable this to be done this in some more elegant and less
+# redundant fashion.
 
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
commit 2a68918b6dbcb7299ad2809e97e4782ab9c4c8a8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 9 08:46:13 2012 +0200

    We don't need doxygen for the sub-configure

diff --git a/configure.in b/configure.in
index 8f3b6da..59c51f2 100644
--- a/configure.in
+++ b/configure.in
@@ -2944,6 +2944,7 @@ if test "$cross_compiling" = "yes"; then
         --disable-zenity \
         --with-num-cpus="$with_num_cpus" \
         --with-max-jobs="$with_max_jobs" \
+        --without-doxygen \
         $sub_conf_opts \
         2>&1 | sed -e 's/^/    /'
     test -f ./Env.Host.sh 2>/dev/null || exit