mirror of
https://github.com/lwthiker/curl-impersonate.git
synced 2026-10-11 19:56:37 +00:00
Upgrade baseline curl to 8.1.1 (#160)
* Upgrade baseline curl to 8.1.1 New curl version includes bugfixes, new options but mainly websocket support which was long requested in curl impersonate. Upstream curl reworked a lot of their http2 code which necessitated a lot of changes on our side as well. * Fix build on mac due to bad header priorities On macos, clang gives priority to /usr/local/include over locations specified with -isystem for some unknown reason. In turn this causes clang to use the system's openssl, which conflicts with curl-impersonate's boringssl headers. To prevent that, disable curl's automatic conversion of -I flags to -isystem. * Upgrade zlib version * Upgrade GitHub Mac runner to macos-12 * Upgrade nghttp2 version to 1.56.0 curl-8.1.1 uses an nghttp2 function that only exists in newer versions of nghttp2.
This commit is contained in:
+4
-5
@@ -14,9 +14,9 @@ NSS_VERSION := nss-3.87
|
||||
NSS_URL := https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/nss-3.87-with-nspr-4.35.tar.gz
|
||||
# In case this is changed, update build-and-test-make.yml as well
|
||||
BORING_SSL_COMMIT := 3a667d10e94186fd503966f5638e134fe9fb4080
|
||||
NGHTTP2_VERSION := nghttp2-1.46.0
|
||||
NGHTTP2_URL := https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.bz2
|
||||
CURL_VERSION := curl-7.84.0
|
||||
NGHTTP2_VERSION := nghttp2-1.56.0
|
||||
NGHTTP2_URL := https://github.com/nghttp2/nghttp2/releases/download/v1.56.0/nghttp2-1.56.0.tar.bz2
|
||||
CURL_VERSION := curl-8.1.1
|
||||
|
||||
brotli_install_dir := $(abspath brotli-$(BROTLI_VERSION)/out/installed)
|
||||
brotli_static_libs := $(brotli_install_dir)/lib/libbrotlicommon-static.a $(brotli_install_dir)/lib/libbrotlidec-static.a
|
||||
@@ -423,12 +423,11 @@ $(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION).tar.xz $(CURL_VERSION)/.
|
||||
config_flags="$$config_flags --with-ca-path=$(with_ca_path)"; \
|
||||
fi; \
|
||||
add_libs="-pthread"; \
|
||||
add_cflags="-I$(boringssl_install_dir)"; \
|
||||
}
|
||||
|
||||
echo "Configuring curl with: $$config_flags"
|
||||
|
||||
./configure $$config_flags CFLAGS="$$add_cflags" LIBS="$$add_libs"
|
||||
./configure $$config_flags LIBS="$$add_libs"
|
||||
|
||||
# Remove possible leftovers from a previous compilation
|
||||
$(MAKE) clean MAKEFLAGS=
|
||||
|
||||
Reference in New Issue
Block a user