[Libreoffice-commits] core.git: 3 commits - bin/lo-all-static-libs ios/Executable_LibreOffice.mk solenv/gbuild

[Tor Lillqvist]

 bin/lo-all-static-libs                |   23 ++++++++++++++++++-----
 ios/Executable_LibreOffice.mk         |    9 +--------
 solenv/gbuild/platform/IOS_ARM_GCC.mk |   23 +----------------------
 3 files changed, 20 insertions(+), 35 deletions(-)

New commits:
commit 4106fe8d00a33537aa6c4f8d5c9df6f940a47d18
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 17:05:19 2013 +0200

    Use the lo-all-static-libs script
    
    Change-Id: Id2bef2696d0bdc618d2fc53658ad8ba23bbad310

diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 05477b9..7327d38 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -36,13 +36,6 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
 # rebuilt if any library has been rebuilt. Avoids need for "make
 # ios.clean".
 
-# Yeah, this isn't the full list. I couldn't be bothered. Do we want to
-# list everything here, too (as in gb_LinkTarget__command_dynamiclink in
-# solenv/gbuild/platform/IOS_ARM_GCC.mk)? Should we have a global gb_
-# variable for that list? (To be used for Android builds, too.)
-
-$(WORKDIR)/LinkTarget/Executable/LibreOffice : \
-    $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
-    $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a)
+$(WORKDIR)/LinkTarget/Executable/LibreOffice : $(shell $(SRCDIR)/bin/lo-all-static-libs)
 
 # vim: set ts=4 sw=4 et:
commit 263d8b92705c2492473383da11aebb9f9265a06e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 17:04:51 2013 +0200

    Expand the FOO_LIBS vars to a list of the actual archives
    
    Thus the output can also be used in makefiles where a list of actual
    files is needed.
    
    Change-Id: I23396dc2e98c47b99cbf53926f247bd834119976

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 1fd2e6e..b363e67 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -17,12 +17,25 @@ if test "$OS" != ANDROID -a "$OS" != IOS; then
     echo This script makes sense only in Android or iOS builds.
 fi
 
+foolibs=
+for var in EBOOK_LIBS FREEHAND_LIBS HUNSPELL_LIBS HYPHEN_LIB MYTHES_LIBS; do
+    dirs=
+    libs=
+    for i in `eval echo '$'$var`; do
+	case "$i" in
+	-L*) dirs="$dirs ${i#-L}";;
+        -l*) libs="$libs ${i#-l}";;
+	esac
+    done
+    for l in $libs; do
+	for d in $dirs; do
+	    test -f $d/lib$l.a && foolibs="$foolibs $d/lib$l.a"
+	done
+    done
+done
+
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
-     $EBOOK_LIBS \
-     $FREEHAND_LIBS \
-     $HUNSPELL_LIBS \
-     $HYPHEN_LIB \
-     $MYTHES_LIBS \
+     $foolibs \
      $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
      $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
      $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
commit eda27039c157c1102209d242670d5a622242827e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 16:43:45 2013 +0200

    Use the lo-all-static-libs script
    
    Change-Id: Ifa9d755ff223f310881cece4d6dcfdd690ee8c78

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index ca5c3c8..59923e9 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -117,28 +117,7 @@ define gb_LinkTarget__command_dynamiclink
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
 		$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
-		$(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
-		$(EBOOK_LIBS) \
-		$(FREEHAND_LIBS) \
-		$(HUNSPELL_LIBS) \
-		$(HYPHEN_LIB) \
-		$(MYTHES_LIBS) \
-		$(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/libodfgen/src/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \
-		$(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \
+		$(shell $(SRCDIR)/bin/lo-all-static-libs) \
 		$(T_LIBS) \
 		-o $(1))
 endef