diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-05-24 21:41:17 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-05-25 09:03:09 +0200 |
| commit | a4b5bc2330e3656084dab21459e9b7ae1f58ebaf (patch) | |
| tree | 9b47a1230d2f329fe488f3e94e5965108084e32b /external | |
| parent | 4a340e36e8d3713806719351f455711c1254a178 (diff) | |
xmlsec: use configure flags instead of patching out apps/docs
These flags are new in xmlsec-1.2.24.
Change-Id: If32faa6e1d3a5f51fa4d631973d8bd0962783a34
Reviewed-on: https://gerrit.libreoffice.org/38004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxmlsec/ExternalProject_xmlsec.mk | 2 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-configure.patch.1 | 32 |
2 files changed, 1 insertions, 33 deletions
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 33fe25bb6977..133b5505ac9e 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 \ + --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --disable-apps --disable-docs \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CFLAGS="$(CFLAGS) $(if $(debug),$(gb_COMPILERNOOPTFLAGS) $(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) $(gb_VISIBILITY_FLAGS)" \ $(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 b/external/libxmlsec/xmlsec1-configure.patch.1 index 5718e223cad7..5d53684a99f9 100644 --- a/external/libxmlsec/xmlsec1-configure.patch.1 +++ b/external/libxmlsec/xmlsec1-configure.patch.1 @@ -15,38 +15,6 @@ Conflicts: win32/Makefile.msvc | 2 +- 4 files changed, 44 insertions(+), 16 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 82e26656..dac213ad 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,10 +3,10 @@ NULL = - SAFE_VERSION = @XMLSEC_VERSION_SAFE@ - SUBDIRS = include src - if XMLSEC_APPS --SUBDIRS += apps -+SUBDIRS += - endif - if XMLSEC_DOCS --SUBDIRS += man docs -+SUBDIRS += - endif - TEST_APP = apps/xmlsec1$(EXEEXT) - DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ -diff --git a/Makefile.in b/Makefile.in -index ef0aed99..73f9db9c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -89,8 +89,8 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@XMLSEC_APPS_TRUE@am__append_1 = apps --@XMLSEC_DOCS_TRUE@am__append_2 = man docs -+@XMLSEC_APPS_TRUE@am__append_1 = -+@XMLSEC_DOCS_TRUE@am__append_2 = - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ diff --git a/configure.ac b/configure.ac index c100f92e..6e5c387b 100644 --- a/configure.ac |