summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-03-10 14:54:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-03-11 10:56:40 +0000
commit30b9c6a457de61f3c94431ecc75716f866c3379e (patch)
tree4fb281c6b0f94570fbac0fccdbf2f571f36cdb01
parentb2d53cc003d070181d80af92d1568de1bdcfe73b (diff)
tdf#98416: Explicitly disable curl hardcoded CA certificate store
Add --without-ca-bundle --without-ca-path options to curl configure in Linux, to explicitly disable the hardcoded curl CA certificate store. If the store is not disabled, curl configure will try to find one suitable for the Linux distro on which it's being built, leading to possible problems when building on a Linux distro type while targeting another Linux distro type (e.g. building on Red Hat derivative targeting Debian derivative). Change-Id: Id1ddf1d74e33bc66e4f7187e376d7379f5c4f36a Reviewed-on: https://gerrit.libreoffice.org/23141 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--external/curl/ExternalProject_curl.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index e31f5d64aee9..9dd4a07b4d82 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,6 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-librtmp --disable-ldaps --disable-tftp --disable-pop3 \
--disable-imap --disable-smtp --disable-manual --without-metalink \
--without-nghttp2 \
+ $(if $(filter LINUX,$(OS)),--without-ca-bundle --without-ca-path) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \