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

Miklos Vajna vmiklos at collabora.co.uk
Thu Jul 6 09:15:34 UTC 2017


 external/libxmlsec/ExternalProject_xmlsec.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ca5b52818d98583feeb59a4b61dde1bcd46b42c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jul 6 09:13:01 2017 +0200

    libxmlsec: no need to build the gcrypt backend on Linux/macOS
    
    We only use the NSS one.
    
    Change-Id: I84c89cb22a1b880d59ada4b68167e14c1223a177
    Reviewed-on: https://gerrit.libreoffice.org/39618
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 942bda06fbd4..7403e3b8a61c 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 		$(if $(filter AIX,$(OS)),ACLOCAL="aclocal -I /opt/freeware/share/aclocal") \
 		autoreconf \
 		&& ./configure \
-			--with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --disable-apps --disable-docs \
+			--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)) \


More information about the Libreoffice-commits mailing list