[Libreoffice-commits] core.git: 4 commits - configure.ac solenv/bin vcl/Library_vcl.mk xmlsecurity/Module_xmlsecurity.mk

[Tor Lillqvist]

 configure.ac                      |    4 +++-
 solenv/bin/native-code.py         |    2 +-
 vcl/Library_vcl.mk                |    2 +-
 xmlsecurity/Module_xmlsecurity.mk |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1a82f413ce983e6a47744881b1543d7870d8362a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 19:14:24 2015 +0300

    I don't think we want to use NSS on iOS either
    
    Change-Id: I3366e9e33e639534c09ddab2f092ef8e9e3b25e5

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index faa8f43..b5c0499 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 	$(if $(filter LINUX MACOSX,$(OS)), \
 		curl) \
 	jpeg \
-	$(if $(filter-out WNT,$(OS)), \
+	$(if $(filter-out IOS WNT,$(OS)), \
 		nss3 \
 		plc4) \
 	libeot \
commit 9c1d7724ada6124c3ba839bd4cb5c6463001f689
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 19:12:51 2015 +0300

    We hardly want xsec stuff for iOS if not for Android either
    
    Change-Id: I483e2ac92b1fcd7176dd71534cf1c2623ce5a651

diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 596ccad..b4f2646 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,xmlsecurity))
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	Library_xmlsecurity \
 	Library_xsec_fw \
-	$(if $(filter-out ANDROID,$(OS)),Library_xsec_xmlsec) \
+	$(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
commit ffaab97ac9a20476185d238b399c7ad093231af3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 18:29:59 2015 +0300

    We hardly want xsec stuff for iOS if not for Android either
    
    Change-Id: Ic6485b060eceb47dc96ee102733f308d71beedb8

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 44b1515..24cb818 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -52,7 +52,7 @@ core_factory_list = [
     ("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
     ("libxoflo.a", "xof_component_getFactory"),
     ("libxolo.a", "xo_component_getFactory"),
-    ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#ifndef ANDROID"),
+    ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if !defined ANDROID && !defined IOS"),
     ("libxstor.a", "xstor_component_getFactory"),
     ("libvclcanvaslo.a", "vclcanvas_component_getFactory"),
     ("libmtfrendererlo.a", "mtfrenderer_component_getFactory"),
commit 05b8724bda3b467840c5346be50e4ee0275f385c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 18:29:17 2015 +0300

    We indeed don't want to build NSS for iOS, I think
    
    Change-Id: I4917c0158c09b0f5e0a90c373e7e85c734b81366

diff --git a/configure.ac b/configure.ac
index 4259a89..d58df0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8851,7 +8851,9 @@ AC_SUBST(TLS)
 dnl ===================================================================
 dnl Check for system NSS
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
+if test $_os != iOS; then
+    libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
+fi
 if test "$with_system_nss" = "yes"; then
     libo_MINGW_CHECK_DLL([libnspr4])
     libo_MINGW_CHECK_DLL([libplc4])