From 41bcff0e8f6c26721e0c25b462a9dee1847a7470 Mon Sep 17 00:00:00 2001 From: Col-Waltz <ostanevich.ilya@yandex.ru> Date: Fri, 20 Sep 2024 18:44:26 +0300 Subject: [PATCH] build: curl option BUILD_MISC_DOCS set OFF Curl option BUILD_MISC_DOCS builds misc man pages and set ON by default. Other documentation building options such as ENABLE_CURL_MANUAL and BUILD_LIBCURL_DOCS was set OFF in BuildLibCurl.cmake. I suppose this option has to be added in commit 7192bf667917 ("third_party: update libcurl from 8.7.0 to 8.8.0+patches") and set OFF. Follows up #9885 NO_TEST=does not change tarantool behavior NO_DOC=does not change tarantool behavior (cherry picked from commit 1080995fa4083c4de6aa19e964b98f0ffb7e34c5) --- changelogs/unreleased/libcurl-doc-option-fix.md | 3 +++ cmake/BuildLibCURL.cmake | 1 + 2 files changed, 4 insertions(+) create mode 100644 changelogs/unreleased/libcurl-doc-option-fix.md diff --git a/changelogs/unreleased/libcurl-doc-option-fix.md b/changelogs/unreleased/libcurl-doc-option-fix.md new file mode 100644 index 0000000000..9a0de0adbf --- /dev/null +++ b/changelogs/unreleased/libcurl-doc-option-fix.md @@ -0,0 +1,3 @@ +## bugfix/build + +* The `BUILD_MISC_DOCS` curl option is now disabled by default (gh-10576). diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake index 872058ec71..ba6b183506 100644 --- a/cmake/BuildLibCURL.cmake +++ b/cmake/BuildLibCURL.cmake @@ -43,6 +43,7 @@ macro(curl_build) # Let's disable building documentation for curl to save build time. list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_CURL_MANUAL=OFF") + list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_MISC_DOCS=OFF") list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_LIBCURL_DOCS=OFF") # Setup use of openssl, use the same OpenSSL library -- GitLab