From 3442b004e6263cb0526b0c2d96318d21623eec2b Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 12 Aug 2014 16:50:17 +0300
Subject: [PATCH] Now that we build NSS, we can build libxmlsec and
 libxsec_xmlsec for iOS, too

Change-Id: I65ab8aad0744a2aa254fefc7732cd8130bb249fb
---
 RepositoryExternal.mk                        | 2 +-
 bin/lo-all-static-libs                       | 5 +++++
 external/libxmlsec/ExternalProject_xmlsec.mk | 2 +-
 external/libxmlsec/Module_libxmlsec.mk       | 2 +-
 postprocess/Rdb_services.mk                  | 3 ++-
 solenv/bin/native-code.py                    | 1 +
 xmlsecurity/Module_xmlsecurity.mk            | 2 +-
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6f6d787a84ce..621ff4126eb1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3226,7 +3226,7 @@ endif # GUIBASE=unx
 
 gb_ExternalProject__use_nss3:=
 
-ifeq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq ($(OS),ANDROID)
 
 gb_LinkTarget__use_nss3:=
 
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 01fc3cfc8b51..75321644211b 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -42,6 +42,11 @@ 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"
+    # Unfortunately NSS's build mechanism copies each static archive
+    # it constructs to another place, but we don't bother filtering
+    # out duplicates, it shouldn't hurt.
     nsslibs=`find $WORKDIR/UnpackedTarball/nss -name 'lib*.a'`
     ;;
 *)
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index f554ec839d7e..e6bdf4f742ac 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -50,7 +50,7 @@ else
 
 $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 	$(call gb_ExternalProject_run,build,\
-		$(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
+		$(if $(filter IOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
 		$(if $(filter AIX,$(OS)),ACLOCAL="aclocal -I /opt/freeware/share/aclocal") \
 		autoreconf \
 		&& ./configure \
diff --git a/external/libxmlsec/Module_libxmlsec.mk b/external/libxmlsec/Module_libxmlsec.mk
index 3e51e4ace55f..491dec7986f6 100644
--- a/external/libxmlsec/Module_libxmlsec.mk
+++ b/external/libxmlsec/Module_libxmlsec.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,libxmlsec))
 
-ifneq ($(filter-out ANDROID IOS,$(OS)),)
+ifneq ($(filter-out ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,libxmlsec,\
 	UnpackedTarball_xmlsec \
 	ExternalPackage_xmlsec \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 4fab2adec205..b88e76378a84 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -110,6 +110,8 @@ $(eval $(call gb_Rdb_add_components,services,\
 	xmlscript/util/xmlscript \
 	xmlsecurity/util/xmlsecurity \
 	xmlsecurity/util/xsec_fw \
+	$(if $(filter-out ANDROID,$(OS)), \
+		xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
 	$(if $(ENABLE_COINMP), \
 		sccomp/source/solver/coinmpsolver \
 	) \
@@ -330,7 +332,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	extensions/source/scanner/scn \
 	extensions/source/update/feed/updatefeed \
 	xmlhelp/util/ucpchelp1 \
-	xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows) \
 	$(if $(filter-out WNT,$(OS)),\
 		shell/source/cmdmail/cmdmail \
 	) \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9b3895cd4599..605406507ef2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -46,6 +46,7 @@ core_factory_list = [
     ("libutllo.a", "utl_component_getFactory"),
     ("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
     ("libxolo.a", "xo_component_getFactory"),
+    ("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory"),
     ("libxstor.a", "xstor_component_getFactory"),
     ]
 
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index fffd9666bc67..596ccad58778 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 IOS ANDROID,$(OS)),Library_xsec_xmlsec) \
+	$(if $(filter-out ANDROID,$(OS)),Library_xsec_xmlsec) \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\