Skip to content
Snippets Groups Projects
Commit 3b9952fb authored by Col-Waltz's avatar Col-Waltz Committed by Alexander Turenko
Browse files

build: added curl options missed by previous bumps

Some curl options appear to missed by several previous curl bumps.
Here is a list of missed options with curl commits in which
they first appeared:

BUILD_EXAMPLES - Build libcurl examples.
Added in curl 8.8.0 release in commit curl/curl@dfdd978f7c60
("cmake: add `BUILD_EXAMPLES` option to build examples")

USE_ECH - Enables ECH support.
Added in curl 8.8.0 release in commit curl/curl@a362962b7289
("TLS: add support for ECH (Encrypted Client Hello)")

USE_HTTPSRR - Enables HTTPS RR support for ECH.
Added in curl 8.8.0 release in commit curl/curl@a362962b7289
("TLS: add support for ECH (Encrypted Client Hello)")

BUILD_STATIC_CURL - Builds curl executable with static libcurl.
Added in curl 8.3.0 release in commit curl/curl@1199308dbc90
("cmake: support building static and shared libcurl in one go")

CURL_DISABLE_NEGOTIATE_AUTH - Disables negotiate authentication.
Added in curl 8.3.0 release in commit curl/curl@e92edfbef644
("lib: add ability to disable auths individually")

CURL_DISABLE_SRP - Disables TLS-SRP support.
Added in curl 8.4.0 release in commit curl/curl@781242ffa44a
("cmake: detect TLS-SRP in OpenSSL/wolfSSL/GnuTLS")

NO_TEST=does not change tarantool behavior
NO_DOC=does not change tarantool behavior

(cherry picked from commit 97e3136ddc691f42cf0a5dff27881978b3c25d52)
parent 24016012
No related branches found
No related tags found
No related merge requests found
## bugfix/build
* Several forgotten curl options are set in our build script.
......@@ -28,7 +28,12 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_C_FLAGS=${LIBCURL_CFLAGS}")
# Switch on the static build.
#
# The BUILD_STATIC_CURL option has no effect, because
# BUILD_CURL_EXE iS OFF. It is set for consistency:
# our approach is to set all options explicitly.
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_STATIC_LIBS=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_STATIC_CURL=ON")
# Switch off the shared build.
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_SHARED_LIBS=OFF")
......@@ -98,6 +103,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_BEARER_AUTH=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_DIGEST_AUTH=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_KERBEROS_AUTH=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_NEGOTIATE_AUTH=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_AWS=ON")
# Don't attempt to find system CA bundle/certificates at
......@@ -151,6 +157,9 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_PROXY=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_IPV6=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_COOKIES=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_EXAMPLES=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_ECH=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_HTTPSRR=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_UNIX_SOCKETS=ON")
# Should be already set by "-DHTTP_ONLY=ON" above.
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_FTP=ON")
......@@ -166,6 +175,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_MQTT=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_SMTP=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_ALTSVC=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_SRP=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_DOH=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_GETOPTIONS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_HSTS=OFF")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment