[Libreoffice-commits] core.git: bin/lo-all-static-libs external/Module_external.mk

[Tor Lillqvist]

 bin/lo-all-static-libs      |    2 --
 external/Module_external.mk |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a7b9d29dd6b166c134666f8a235afbc1f2bd0288
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 21:06:14 2015 +0300

    We don't want libxmlsec on iOS, I think
    
    It would require NSS which I just decided to skip. If/when we patch it
    to support native iOS (and OS X?) crypto APIs, re-consider. Or
    something.
    
    Now the TiledLibreOffice iOS demo app builds again.
    
    Change-Id: I2816a49bbdbde5a8f9d3b9fcdfff420bdca05ff8

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index effa190..e6052c3 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -44,8 +44,6 @@ ANDROID)
     ;;
 IOS)
     oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
-    oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a"
-    oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a"
     ;;
 *)
     oslibs=
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 51900d5..a5dcade 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -19,7 +19,7 @@ endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
 	accessories \
-	libxmlsec \
+	$(if $(filter-out IOS,$(OS)),libxmlsec) \
 	$(call gb_Helper_optional,ABW,libabw) \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	$(call gb_Helper_optional,APR,apr) \