package/libcurl: unbreak threads + c-ares conditional
PATCH 1/1 package/libcurl: unbreak threads + c-ares conditional
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.
--- package/libcurl/libcurl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libcurl/libcurl.mk +1 -1
@@ -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
Signature · 6 lines
2.39.5 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Peter,
Quoted 6 lines · 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 <[email protected]>Signed-off-by Peter Korsgaard <[email protected]>
Thanks,
baruch
Quoted 17 lines
--- package/libcurl/libcurl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/libcurl/libcurl.mk +1
-1@@ -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
Signature · 7 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildrootQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> 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 <[email protected]>Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Perale via buildroot
AppliedIn reply of:
Quoted 6 lines
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 <[email protected]>Signed-off-by Peter Korsgaard <[email protected]>
Applied to 2025.02.x. Thanks
Quoted 24 lines
--- package/libcurl/libcurl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/libcurl/libcurl.mk +1
-1@@ -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-resolverSignature · 6 lines
2.39.5 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Perale via buildroot
AppliedIn reply of:
Quoted 6 lines
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 <[email protected]>Signed-off-by Peter Korsgaard <[email protected]>
Applied to 2025.05.x. Thanks
Quoted 24 lines
--- package/libcurl/libcurl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/libcurl/libcurl.mk +1
-1@@ -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-resolverSignature · 6 lines
2.39.5 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot