From ab50f0b08b22af1e60a0b6ce5e7e8e7d1f665216 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 21 Jun 2017 21:59:11 +0200 Subject: xmlsecurity: implement support for building against system-xmlsec The only remaining difference is that in the system-xmlsec case we work with the default key manager, not with the one that's only added by our xmlsec patches. This works for me for the uses I know of (see for the motivation): signing and verifying of different signatures (bad signature, good with non-trusted CA, good with trusted CA) with software-based certificates all behave as expected. Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06 Reviewed-on: https://gerrit.libreoffice.org/39075 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- xmlsecurity/Library_xsec_xmlsec.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'xmlsecurity/Library_xsec_xmlsec.mk') diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index d35bc848930e..41f6d81e169e 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -46,12 +46,16 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xo \ )) +ifeq ($(SYSTEM_XMLSEC),) $(eval $(call gb_Library_use_packages,xsec_xmlsec,\ xmlsec \ )) +endif + $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ boost_headers \ libxml2 \ + xmlsec \ )) ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),) $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ @@ -128,12 +132,16 @@ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \ )) else + +ifeq ($(SYSTEM_XMLSEC),) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \ )) endif +endif + $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ plc4 \ )) -- cgit