From e5542a8c3d5fa489d27e85ae282cc67e8f5a8ec5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 7 Nov 2018 21:06:24 +0100 Subject: xmlsec: replace patch with specifying NSPR/NSS_CFLAGS/LIBS Change-Id: I386ead3e61a3162c1c4605d2f65ad23a6487389f Reviewed-on: https://gerrit.libreoffice.org/63046 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- external/xmlsec/ExternalProject_xmlsec.mk | 4 +- external/xmlsec/xmlsec1-configure.patch.1 | 64 ------------------------------- 2 files changed, 2 insertions(+), 66 deletions(-) (limited to 'external/xmlsec') diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk index f8f843cd016f..0a76386453ff 100644 --- a/external/xmlsec/ExternalProject_xmlsec.mk +++ b/external/xmlsec/ExternalProject_xmlsec.mk @@ -44,8 +44,8 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : --without-openssl \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \ - $(if $(SYSTEM_NSS),,--with-nss=$(call gb_UnpackedTarball_get_dir,nss)/dist/public) \ - $(if $(SYSTEM_NSS),,--with-nspr=$(call gb_UnpackedTarball_get_dir,nss)/dist/out) \ + $(if $(SYSTEM_NSS),,NSPR_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" NSPR_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lnspr4") \ + $(if $(SYSTEM_NSS),,NSS_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss" NSS_LIBS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lsmime3 -lnss3 -lnssutil3") \ $(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)) \ diff --git a/external/xmlsec/xmlsec1-configure.patch.1 b/external/xmlsec/xmlsec1-configure.patch.1 index cd009af1cce0..84d48ad023e6 100644 --- a/external/xmlsec/xmlsec1-configure.patch.1 +++ b/external/xmlsec/xmlsec1-configure.patch.1 @@ -13,70 +13,6 @@ Conflicts: win32/Makefile.msvc | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 951b3ebe..83fe34cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -863,15 +863,28 @@ NSS_MIN_VERSION="3.11.1" - NSPR_MIN_VERSION="4.4.1" - SEAMONKEY_MIN_VERSION="1.0" - MOZILLA_MIN_VERSION="1.4" -+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then -+ MOZILLA_MIN_VERSION="1.0" -+fi - NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" - NSPR_PACKAGE=mozilla-nspr - NSS_PACKAGE=mozilla-nss --NSPR_INCLUDE_MARKER="nspr/nspr.h" -+NSPR_INCLUDE_MARKER="nspr.h" - NSPR_LIB_MARKER="libnspr4$shrext" --NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" - NSS_INCLUDE_MARKER="nss/nss.h" - NSS_LIB_MARKER="libnss3$shrext" --NSS_LIBS_LIST="-lnss3 -lsmime3" -+ -+case $host_os in -+cygwin* | pw32*) -+ NSS_LIBS_LIST="-lnss3 -lsmime3" -+ NSPR_LIBS_LIST="-lnspr4" -+ ;; -+ -+*) -+ NSS_LIBS_LIST="-lnss3 -lsmime3" -+ NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" -+ ;; -+esac - - XMLSEC_NO_NSS="1" - NSPR_INCLUDE_PATH= -@@ -907,8 +921,8 @@ if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes - fi - if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then - AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) -- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then -- NSS_INCLUDE_PATH="$with_nss/include" -+ if test -f "$with_nss/$NSS_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSS_LIB_MARKER" ; then -+ NSS_INCLUDE_PATH="$with_nss" - NSS_LIB_PATH="$with_nss/lib" - NSS_FOUND="yes" - AC_MSG_RESULT([yes]) -@@ -935,6 +950,16 @@ dnl seamonkey-nspr and seamonkey-nss - dnl mozilla-nspr and mozilla-nss - dnl xulrunner-nspr and xulrunner-nss - dnl nspr and nss -+if test "z$NSS_FOUND" = "zno" ; then -+ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION, -+ [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss], -+ [NSS_FOUND=no]) -+fi -+if test "z$NSS_FOUND" = "zno" ; then -+ PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8, -+ [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss], -+ [NSS_FOUND=no]) -+fi - if test "z$NSPR_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" -a "z$with_seamonkey_ver" ; then - if test "z$NSPR_FOUND" = "zno" ; then - PKG_CHECK_MODULES(NSPR, seamonkey-nspr >= $NSPR_MIN_VERSION, diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 0689f11b..e7cd5c38 100644 --- a/win32/Makefile.msvc -- cgit