Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3329
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3329/1
xmlsec: honor --disable-openssl and use NSS
On --disable-openssl, let's avoid linking the
bundled libxmlsec to OpenSSL by passing down
--without-openssl to its configure script.
Change-Id: I04447683adeba4b7059e94579adf43ef788a4916
---
M libxmlsec/ExternalPackage_xmlsec.mk
M libxmlsec/ExternalProject_xmlsec.mk
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk
index eebc541..a9fa070 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -25,7 +25,9 @@
endif
else ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
+ifneq ($(DISABLE_OPENSSL),YES)
$(eval $(call
gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-openssl.a,src/openssl/.libs/libxmlsec1-openssl.a))
+endif # DISABLE_OPENSSL
else
$(eval $(call gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.a,src/.libs/libxmlsec1.a))
$(eval $(call
gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.a,src/nss/.libs/libxmlsec1-nss.a))
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 6535672..640cdf8 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -15,7 +15,9 @@
$(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
+ifneq ($(DISABLE_OPENSSL),YES)
$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
+endif # DISABLE_OPENSSL
$(eval $(call gb_ExternalProject_register_targets,xmlsec,\
build \
@@ -53,7 +55,7 @@
$(if $(filter MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") autoreconf \
&& ./configure \
--with-pic --disable-shared --disable-crypto-dl --without-libxslt
--without-gnutls \
- $(if $(filter ANDROID,$(OS)),--with-openssl=$(OUTDIR),--without-openssl) \
+ $(if $(and $(filter ANDROID,$(OS)),$(filter-out
YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-openssl) \
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
--
To view, visit https://gerrit.libreoffice.org/3329
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04447683adeba4b7059e94579adf43ef788a4916
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andres Gomez <agomez@igalia.com>
Context
- [PATCH] xmlsec: honor --disable-openssl and use NSS · Andres Gomez (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.