external/xmlsec/ExternalProject_xmlsec.mk | 2 ++
external/xmlsec/xmlsec1-configure.patch.1 | 13 +------------
2 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit 5b2d9b0cd0ef8ea44ced8a3479fa521b74058edc
Author: Luboš Luňák <l.lu...@collabora.com>
Date: Thu Jun 21 10:35:39 2018 +0200
fix xmlsec for --with-system-nss
Change-Id: I95e720c9ee5774d87bb4eb8388f8a302ffed8a9b
Reviewed-on: https://gerrit.libreoffice.org/56222
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/external/xmlsec/ExternalProject_xmlsec.mk
b/external/xmlsec/ExternalProject_xmlsec.mk
index bdda2a53172f..8ff1057f18b1 100644
--- a/external/xmlsec/ExternalProject_xmlsec.mk
+++ b/external/xmlsec/ExternalProject_xmlsec.mk
@@ -43,6 +43,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 $(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 8a3329abda4b..60d2eb0ccab3 100644
--- a/external/xmlsec/xmlsec1-configure.patch.1
+++ b/external/xmlsec/xmlsec1-configure.patch.1
@@ -49,19 +49,8 @@ index 951b3ebe..83fe34cb 100644
XMLSEC_NO_NSS="1"
NSPR_INCLUDE_PATH=
-@@ -896,6 +909,7 @@ if test "z$with_nss" = "zno" -o "z$with_nspr" = "zno" ;
then
+@@ -907,8 +921,8 @@ if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a
"z$with_nspr" != "zyes
fi
-
- dnl Priority 1: User specifies the path to installation
-+with_nspr="${WORKDIR}/UnpackedTarball/nss/dist/out"
- if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" !=
"zyes" ; then
- AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f
"$with_nspr/lib/$NSPR_LIB_MARKER" ; then
-@@ -907,10 +921,11 @@ if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z"
-a "z$with_nspr" != "zyes
- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER"
and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?])
- fi
- fi
-+with_nss="${WORKDIR}/UnpackedTarball/nss/dist/public"
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
