[Libreoffice-commits] core.git: external/libxmlsec

[Gautam Prajapati]

 external/libxmlsec/ExternalProject_xmlsec.mk |    6 ++----
 external/libxmlsec/Module_libxmlsec.mk       |    2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 4644364318c6c4fec3e338b4bf35e7e31b03dd7b
Author: Gautam Prajapati <gautamprajapati06 at gmail.com>
Date:   Fri Aug 18 18:06:59 2017 +0530

    Fix and enable libxmlsec build for Android
    
    This commit removes the OpenSSL dependency unconditionally from
    external/libxmlsec/ExternalProject_xmlsec.mk.
    xmlsec wasn't built for Android previously but it seems like
    Android was the only user of xmlsec OpenSSL backend.
    Now we have NSS built for Android as well, so it's safe to remove
    the OpenSSL dependency.
    
    Change-Id: I8652487be146c3ac643c4f6dc7a6a2845093c93f
    Reviewed-on: https://gerrit.libreoffice.org/41288
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 7403e3b8a61c..6a01b893aa29 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
 
 $(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
 
-$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
-
 $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
 	build \
 ))
@@ -41,12 +39,12 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 			--with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --without-gcrypt --disable-apps --disable-docs \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			CFLAGS="$(CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)) $(gb_VISIBILITY_FLAGS)" \
-			$(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \
+			--without-openssl \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
-			LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \
+			LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),",-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \
 		&& $(MAKE) \
 	)
 
diff --git a/external/libxmlsec/Module_libxmlsec.mk b/external/libxmlsec/Module_libxmlsec.mk
index 491dec7986f6..7196c02cec9f 100644
--- a/external/libxmlsec/Module_libxmlsec.mk
+++ b/external/libxmlsec/Module_libxmlsec.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,libxmlsec))
 
-ifneq ($(filter-out ANDROID,$(OS)),)
 $(eval $(call gb_Module_add_targets,libxmlsec,\
 	UnpackedTarball_xmlsec \
 	ExternalPackage_xmlsec \
 	ExternalProject_xmlsec \
 ))
-endif
 
 # vim: set noet sw=4 ts=4: