From 88220b45ed9e7e74fed3d93dca73077b7dc3499b Mon Sep 17 00:00:00 2001
From: Alexander Turenko <alexander.turenko@tarantool.org>
Date: Fri, 11 Oct 2024 01:39:27 +0300
Subject: [PATCH] build: don't depend on libidn2
The recent libcurl update in commit 0919f390802f ("third_party: update
libcurl from 8.8.0 to 8.10.1") reveals an old problem in our libcurl's
build script: it attempts to disable the libidn2 dependency using the
`-DHAVE_LIBIDN2=OFF` option instead of `-DUSE_LIBIDN2=OFF`.
It doesn't work after a recent curl building machinery change, see
https://github.com/curl/curl/pull/14555
This commit fixes the problem by using `-DUSE_LIBIDN2=OFF`.
Reported in #10621
NO_DOC=build mechanics fixup
NO_CHANGELOG=fixes a non-released commit
NO_TEST=verified locally, seems to need an extra work on a separate CI
workflow with a particular building environment; no time for
that tonight, sorry
(cherry picked from commit a4b4158f2196442308aba7df8f8e21b98b5319fc)
---
cmake/BuildLibCURL.cmake | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake
index c859a4c2db..eae906021e 100644
--- a/cmake/BuildLibCURL.cmake
+++ b/cmake/BuildLibCURL.cmake
@@ -150,8 +150,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_RUSTLS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_WOLFSSH=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_GSASL=OFF")
- list(APPEND LIBCURL_CMAKE_FLAGS "-DHAVE_LIBIDN2=OFF")
- list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBIDN2=ON")
+ list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBIDN2=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_NGTCP2=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_NGHTTP3=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_QUICHE=OFF")
--
GitLab