[Buildroot] [PATCH] package/libcurl: unbreak threads + c-ares conditional

[Buildroot] [PATCH] package/libcurl: unbreak threads + c-ares conditional

[Peter Korsgaard]

Commit 0fce7a9623 ("package/libcurl: fix build w/ threads + c-ares") added a
conditional for threads + c-ares, but ended up with a end-parenthesis too
many - so the condition is never true.  Fix that.

Reported-by: Tibault Damman <tibault.damman@basalte.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/libcurl/libcurl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 5a3a668f06..e390c9d1bf 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -38,7 +38,7 @@ LIBCURL_IGNORE_CVES += CVE-2024-32928
 
 # 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)
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)x$(BR2_PACKAGE_C_ARES),yx)
 LIBCURL_CONF_OPTS += --enable-threaded-resolver
 else
 LIBCURL_CONF_OPTS += --disable-threaded-resolver
-- 
2.39.5

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/libcurl: unbreak threads + c-ares conditional

[Baruch Siach via buildroot]

Hi Peter,

On Wed, Jun 25 2025, Peter Korsgaard wrote:
> Commit 0fce7a9623 ("package/libcurl: fix build w/ threads + c-ares") added a
> conditional for threads + c-ares, but ended up with a end-parenthesis too
> many - so the condition is never true.  Fix that.
>
> Reported-by: Tibault Damman <tibault.damman@basalte.be>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Reviewed-by: Baruch Siach <baruch@tkos.co.il>

Thanks,
baruch

> ---
>  package/libcurl/libcurl.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
> index 5a3a668f06..e390c9d1bf 100644
> --- a/package/libcurl/libcurl.mk
> +++ b/package/libcurl/libcurl.mk
> @@ -38,7 +38,7 @@ LIBCURL_IGNORE_CVES += CVE-2024-32928
>  
>  # 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)
> +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)x$(BR2_PACKAGE_C_ARES),yx)
>  LIBCURL_CONF_OPTS += --enable-threaded-resolver
>  else
>  LIBCURL_CONF_OPTS += --disable-threaded-resolver

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/libcurl: unbreak threads + c-ares conditional

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > Commit 0fce7a9623 ("package/libcurl: fix build w/ threads + c-ares") added a
 > conditional for threads + c-ares, but ended up with a end-parenthesis too
 > many - so the condition is never true.  Fix that.

 > Reported-by: Tibault Damman <tibault.damman@basalte.be>
 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/libcurl: unbreak threads + c-ares conditional

[Thomas Perale via buildroot]

In reply of:
> Commit 0fce7a9623 ("package/libcurl: fix build w/ threads + c-ares") added a
> conditional for threads + c-ares, but ended up with a end-parenthesis too
> many - so the condition is never true.  Fix that.
> 
> Reported-by: Tibault Damman <tibault.damman@basalte.be>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Applied to 2025.02.x. Thanks

> ---
>  package/libcurl/libcurl.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
> index 5a3a668f06..e390c9d1bf 100644
> --- a/package/libcurl/libcurl.mk
> +++ b/package/libcurl/libcurl.mk
> @@ -38,7 +38,7 @@ LIBCURL_IGNORE_CVES += CVE-2024-32928
>  
>  # 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)
> +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)x$(BR2_PACKAGE_C_ARES),yx)
>  LIBCURL_CONF_OPTS += --enable-threaded-resolver
>  else
>  LIBCURL_CONF_OPTS += --disable-threaded-resolver
> -- 
> 2.39.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/libcurl: unbreak threads + c-ares conditional

[Thomas Perale via buildroot]

In reply of:
> Commit 0fce7a9623 ("package/libcurl: fix build w/ threads + c-ares") added a
> conditional for threads + c-ares, but ended up with a end-parenthesis too
> many - so the condition is never true.  Fix that.
> 
> Reported-by: Tibault Damman <tibault.damman@basalte.be>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Applied to 2025.05.x. Thanks

> ---
>  package/libcurl/libcurl.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
> index 5a3a668f06..e390c9d1bf 100644
> --- a/package/libcurl/libcurl.mk
> +++ b/package/libcurl/libcurl.mk
> @@ -38,7 +38,7 @@ LIBCURL_IGNORE_CVES += CVE-2024-32928
>  
>  # 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)
> +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)x$(BR2_PACKAGE_C_ARES),yx)
>  LIBCURL_CONF_OPTS += --enable-threaded-resolver
>  else
>  LIBCURL_CONF_OPTS += --disable-threaded-resolver
> -- 
> 2.39.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot