From 0fce7a9623315cd58750df984b3b9d630eda1700 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 7 Jun 2025 21:07:03 +0200 Subject: [PATCH] package/libcurl: fix build w/ threads + c-ares Fixes: https://autobuild.buildroot.net/results/680b825b93989e6aef247593c198094a6ed916f7/ Since curl 8.14.0 with commit d364f1347f05 ("configure: catch asking for double resolver without https-rr"), configure errors out when --enabled-threaded-resolver is used together with --enable-ares (unless the experimental HTTPS-RR support is enabled), so disable the threaded resolver when c-ares is enabled. https://github.com/curl/curl/commit/d364f1347f05c53eea5d25a15b4ad8a62ecc85b8 Signed-off-by: Peter Korsgaard Reviewed-by: Baruch Siach Signed-off-by: Julien Olivain --- package/libcurl/libcurl.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 8501910ac5..5a3a668f06 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -36,7 +36,9 @@ LIBCURL_CONF_OPTS = \ # https://nvd.nist.gov/vuln/detail/CVE-2024-32928 LIBCURL_IGNORE_CVES += CVE-2024-32928 -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +# threaded resolver cannot be used with c-ares +# https://github.com/curl/curl/commit/d364f1347f05c53eea5d25a15b4ad8a62ecc85b8 +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)x$(BR2_PACKAGE_C_ARES)),yx) LIBCURL_CONF_OPTS += --enable-threaded-resolver else LIBCURL_CONF_OPTS += --disable-threaded-resolver