From 6b30387e973621c1ff65b620fd4a444312651073 Mon Sep 17 00:00:00 2001 From: woclass Date: Tue, 5 Jul 2022 15:53:13 +0800 Subject: [PATCH] deps/curl: sync build flags with `Yggdrasil/LibCURL` https://github.com/JuliaPackaging/Yggdrasil/blob/d63ee92b565067a7844c938bbbf2f0bdd1eb4e7b/L/LibCURL/common.jl#L28-L40 --- deps/curl.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/deps/curl.mk b/deps/curl.mk index 3f90495c7c042..455f2d66f09ba 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -33,6 +33,16 @@ $(SRCCACHE)/curl-$(CURL_VER)/source-extracted: $(SRCCACHE)/curl-$(CURL_VER).tar. checksum-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 $(JLCHECKSUM) $< +## xref: https://github.com/JuliaPackaging/Yggdrasil/blob/master/L/LibCURL/common.jl +# Disable....almost everything +CURL_CONFIGURE_FLAGS := $(CONFIGURE_COMMON) \ + --without-ssl --without-gnutls --without-libidn2 --without-librtmp \ + --without-nss --without-libpsl --without-libgsasl --without-fish-functions-dir \ + --disable-ares --disable-manual --disable-ldap --disable-ldaps --disable-static +# A few things we actually enable +CURL_CONFIGURE_FLAGS += --enable-versioned-symbols \ + --with-libssh2=${prefix} --with-zlib=${prefix} --with-nghttp2=${prefix} + # We use different TLS libraries on different platforms. # On Windows, we use schannel # On MacOS, we use SecureTransport @@ -44,16 +54,12 @@ CURL_TLS_CONFIGURE_FLAGS := --with-secure-transport else CURL_TLS_CONFIGURE_FLAGS := --with-mbedtls=$(build_prefix) endif +CURL_CONFIGURE_FLAGS += $(CURL_TLS_CONFIGURE_FLAGS) $(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCCACHE)/curl-$(CURL_VER)/source-extracted mkdir -p $(dir $@) cd $(dir $@) && \ - $(dir $<)/configure $(CONFIGURE_COMMON) --includedir=$(build_includedir) \ - --without-ssl --without-gnutls --without-gssapi --disable-ares \ - --without-libidn2 --without-librtmp --without-nss --without-libpsl \ - --disable-ldap --disable-ldaps --without-zsh-functions-dir --disable-static \ - --with-libssh2=$(build_prefix) --with-zlib=$(build_prefix) --with-nghttp2=$(build_prefix) \ - $(CURL_TLS_CONFIGURE_FLAGS) \ + $(dir $<)/configure $(CURL_CONFIGURE_FLAGS) \ CFLAGS="$(CFLAGS) $(CURL_CFLAGS)" LDFLAGS="$(LDFLAGS) $(CURL_LDFLAGS)" echo 1 > $@