[chore](third) Upgrade curl 7.79.0 -> 8.2.1 (#37893)

ref #23414. It was acquired by #37420.
apache · Jul 17, 2024 · aca7ce9 · aca7ce9
1 parent 971a7c8
commit aca7ce9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/doris, and the tag is `build-env-${version}`
 
+## v20240716
+
+- Modified: curl 7.79.0 -> 8.2.1
+
 ## v20231008
 
 - Modified: aws sdk 1.9.211 -> 1.11.119

diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
@@ -656,12 +656,12 @@ build_curl() {
         libs='-lcrypto -lssl -lcrypto -ldl'
     fi
 
-    CPPFLAGS="-I${TP_INCLUDE_DIR} -DNGHTTP2_STATICLIB" \
+    CPPFLAGS="-I${TP_INCLUDE_DIR} " \
         LDFLAGS="-L${TP_LIB_DIR}" LIBS="${libs}" \
         PKG_CONFIG="pkg-config --static" \
         ./configure --prefix="${TP_INSTALL_DIR}" --disable-shared --enable-static \
         --without-librtmp --with-ssl="${TP_INSTALL_DIR}" --without-libidn2 --disable-ldap --enable-ipv6 \
-        --without-libssh2 --without-brotli
+        --without-libssh2 --without-brotli --without-nghttp2
 
     make curl_LDFLAGS=-all-static -j "${PARALLEL}"
     make curl_LDFLAGS=-all-static install

diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
@@ -139,10 +139,10 @@ RAPIDJSON_SOURCE=rapidjson-1a803826f1197b5e30703afe4b9c0e7dd48074f5
 RAPIDJSON_MD5SUM="f2212a77e055a15501477f1e390007ea"
 
 # curl
-CURL_DOWNLOAD="https://curl.se/download/curl-7.79.0.tar.gz"
-CURL_NAME=curl-7.79.0.tar.gz
-CURL_SOURCE=curl-7.79.0
-CURL_MD5SUM="b40e4dc4bbc9e109c330556cd58c8ec8"
+CURL_DOWNLOAD="https://curl.se/download/curl-8.2.1.tar.gz"
+CURL_NAME=curl-8.2.1.tar.gz
+CURL_SOURCE=curl-8.2.1
+CURL_MD5SUM="b25588a43556068be05e1624e0e74d41"
 
 # RE2
 RE2_DOWNLOAD="https://github.com/google/re2/archive/2021-02-02.tar.gz"