external/curl/ExternalProject_curl.mk |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3ad056f8ed9434745292468b96b64be071d62484
Author: Michael Stahl <mst...@redhat.com>
Date:   Wed Aug 9 17:14:11 2017 +0200

    curl: disable more unnecessary stuff
    
    Only HTTP and FTP should be required.
    
    Add --without-libpsl --disable-ares --disable-rtsp --disable-smb,
    and --without-libidn was replaced with --without-libidn2.
    
    Change-Id: Icf6afc8bff4cc7ad7a5a95b0c3f9a345a7cf67a3
    (cherry picked from commit 9fd26734d3cbbd9b58f4b08058a75063632f57d1)
    Reviewed-on: https://gerrit.libreoffice.org/40935
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index f57efc07fd73..27669e367f16 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -46,11 +46,14 @@ $(call gb_ExternalProject_get_state_target,curl,build):
                                --with-darwinssl,\
                                $(if $(ENABLE_NSS),--with-nss$(if 
$(SYSTEM_NSS),,="$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
                        --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 --disable-ldaps --disable-tftp 
--disable-pop3 \
-                       --disable-imap --disable-smtp --disable-manual 
--without-metalink \
-                       --without-nghttp2 \
+                       --enable-ftp --enable-http --enable-ipv6 \
+                       --without-libidn2 --without-libpsl --without-librtmp \
+                       --without-libssh2 --without-metalink --without-nghttp2 \
+                       --disable-ares \
+                       --disable-dict --disable-file --disable-gopher 
--disable-imap \
+                       --disable-ldap --disable-ldaps --disable-manual 
--disable-pop3 \
+                       --disable-rtsp --disable-smb --disable-smtp 
--disable-telnet  \
+                       --disable-tftp  \
                        $(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) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to