external/curl/ExternalProject_curl.mk | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 9a9b116a1fd438f265ff8b6de59f2b2c6bdb0d48
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jun 2 15:48:13 2015 +0200
curl: simplify SSL conditional
Change-Id: I210774ef7432257a3154e8981c0d53e9e63b2110
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 4222419..e31f5d6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -42,10 +42,9 @@ $(call gb_ExternalProject_get_state_target,curl,build):
CPPFLAGS="$(curl_CPPFLAGS)" \
LDFLAGS=$(curl_LDFLAGS) \
./configure \
- $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \
- $(if $(filter IOS,$(OS)),--with-darwinssl) \
- $(if $(filter MACOSX,$(OS)),\
- --with-darwinssl) \
+ $(if $(filter IOS MACOSX,$(OS)),\
+ --with-darwinssl,\
+ --with-nss$(if $(SYSTEM_NSS),,="$(call
gb_UnpackedTarball_get_dir,nss)/dist/out")) \
--without-ssl --without-gnutls --without-polarssl
--without-cyassl --without-axtls \
--without-libidn --enable-ftp --enable-ipv6
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet
--disable-dict --without-libssh2 \
commit 0b8b96ed515eec0a560812be73d4c9742f26e23b
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jun 2 15:45:59 2015 +0200
curl: disable loads more random stuff we don't need
Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index c0ba892..4222419 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -46,10 +46,12 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter IOS,$(OS)),--with-darwinssl) \
$(if $(filter MACOSX,$(OS)),\
--with-darwinssl) \
- --without-ssl \
+ --without-ssl --without-gnutls --without-polarssl
--without-cyassl --without-axtls \
--without-libidn --enable-ftp --enable-ipv6
--enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet
--disable-dict --without-libssh2 \
- --without-librtmp \
+ --without-librtmp --disable-ldaps --disable-tftp
--disable-pop3 \
+ --disable-imap --disable-smtp --disable-manual
--without-metalink \
+ --without-nghttp2 \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
