Skip to content

Commit 1810ddf

Browse files
liguriokyukhin
authored andcommitted
third_party: update libcurl from 7.80.0 to 7.83.0
Changelog: https://curl.se/changes.html#7_83_0 Curl replaced prefix CURL_ with CMAKE_ in private identifiers [1] since the 'CMAKE_' prefix is reserved for CMake's own private use, see [2]. Patch adds a number of options defined in curl build infrastructure with their default values used in 7.83.0. 1. curl/curl@9108da2 2. https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html NO_DOC=libcurl submodule bump NO_TEST=libcurl submodule bump Follows up tarantool#6029
1 parent ff227f8 commit 1810ddf

File tree

3 files changed

+52
-8
lines changed

3 files changed

+52
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## feature/build
2+
3+
* Updated libcurl to version 7.83.0 (gh-6029).

cmake/BuildLibCURL.cmake

+48-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ macro(curl_build)
4242
# Setup use of openssl, use the same OpenSSL library
4343
# for libcurl as is used for tarantool itself.
4444
get_filename_component(FOUND_OPENSSL_ROOT_DIR ${OPENSSL_INCLUDE_DIR} DIRECTORY)
45-
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_USE_OPENSSL=ON")
45+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_OPENSSL=ON")
4646
list(APPEND LIBCURL_CMAKE_FLAGS "-DOPENSSL_ROOT_DIR=${FOUND_OPENSSL_ROOT_DIR}")
4747
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake")
4848

@@ -55,6 +55,10 @@ macro(curl_build)
5555
list(APPEND LIBCURL_FIND_ROOT_PATH ${ARES_INSTALL_DIR})
5656
else()
5757
set(ENABLE_ARES "OFF")
58+
# libcurl build system enables threaded resolver when c-ares is
59+
# disabled, we duplicate this logic because we cannot rely on upstream
60+
# defaults, they may vary across time.
61+
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_THREADED_RESOLVER=ON")
5862
endif()
5963
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_ARES=${ENABLE_ARES}")
6064

@@ -70,13 +74,14 @@ macro(curl_build)
7074
string(REPLACE ";" "$<SEMICOLON>" LIBCURL_FIND_ROOT_PATH_STR "${LIBCURL_FIND_ROOT_PATH}")
7175
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_FIND_ROOT_PATH=${LIBCURL_FIND_ROOT_PATH_STR}")
7276

73-
# On cmake CMAKE_USE_LIBSSH2 flag is enabled by default, we need to switch it
77+
# On cmake CURL_USE_LIBSSH2 flag is enabled by default, we need to switch it
7478
# off to avoid of issues, like:
7579
# ld: libssh2.c:(.text+0x4d8): undefined reference to `libssh2_*...
76-
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_USE_LIBSSH2=OFF")
80+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBSSH2=OFF")
7781

7882
# Switch off the group of protocols with special flag HTTP_ONLY:
79-
# ftp, file, ldap, ldaps, rtsp, dict, telnet, tftp, pop3, imap, smtp.
83+
# ftp, file, ldap, ldaps, rtsp, dict, telnet, tftp, pop3, imap, smtp,
84+
# gopher, mqtt, smb.
8085
list(APPEND LIBCURL_CMAKE_FLAGS "-DHTTP_ONLY=OFF")
8186

8287
# Additionaly disable some more protocols.
@@ -115,13 +120,17 @@ macro(curl_build)
115120
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_CURL_EXE=OFF")
116121
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_BROTLI=OFF")
117122
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_GNUTLS=OFF")
118-
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_USE_MBEDTLS=OFF")
119-
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_USE_WOLFSSL=OFF")
120-
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_USE_NSS=OFF")
123+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_MBEDTLS=OFF")
124+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_WOLFSSL=OFF")
125+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_NSS=OFF")
121126
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_CA_BUNDLE=none")
127+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_CA_BUNDLE_SET=ON")
122128
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_CA_PATH=none")
129+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_CA_PATH_SET=ON")
130+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_CA_FALLBACK=OFF")
123131
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBRTMP=OFF")
124132
list(APPEND LIBCURL_CMAKE_FLAGS "-DHAVE_LIBIDN2=OFF")
133+
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBIDN2=ON")
125134
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_NGTCP2=OFF")
126135
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_NGHTTP3=OFF")
127136
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_QUICHE=OFF")
@@ -141,7 +150,39 @@ macro(curl_build)
141150
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_TFTP=ON")
142151
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_POP3=ON")
143152
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_IMAP=ON")
153+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_MQTT=ON")
144154
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_SMTP=OFF")
155+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_ALTSVC=ON")
156+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_DOH=OFF")
157+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_GETOPTIONS=OFF")
158+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_HSTS=OFF")
159+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_HTTP_AUTH=OFF")
160+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_LIBCURL_OPTION=OFF")
161+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_MIME=OFF")
162+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_NETRC=OFF")
163+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_NTLM=ON")
164+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG=OFF")
165+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_PARSEDATE=OFF")
166+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_PROGRESS_METER=OFF")
167+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_PROXY=OFF")
168+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_SHUFFLE_DNS=ON")
169+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_SOCKETPAIR=OFF")
170+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_VERBOSE_STRINGS=OFF")
171+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_ENABLE_EXPORT_TARGET=ON")
172+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_ENABLE_SSL=ON")
173+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_LTO=OFF")
174+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_BEARSSL=OFF")
175+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_GSSAPI=OFF")
176+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBSSH=OFF")
177+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_OPENLDAP=OFF")
178+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_WERROR=OFF")
179+
# CURL_ZSTD adds zstd encoding/decoding support. Tuning libcurl's build to
180+
# catch the symbols may require extra work.
181+
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_ZSTD=OFF")
182+
list(APPEND LIBCURL_CMAKE_FLAGS "-DLIBCURL_OUTPUT_NAME=libcurl")
183+
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_CURLDEBUG=OFF")
184+
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_DEBUG=OFF")
185+
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_MSH3=OFF")
145186

146187
# We need PIC at least to enable build for Fedora on
147188
# ARM64 CPU. Without it configuration with Fedora

third_party/curl

Submodule curl updated 1204 files

0 commit comments

Comments
 (0)