summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
authorPhilip Lorenz <philip.lorenz@bmw.de>2024-08-05 10:04:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-08 14:28:49 +0100
commita09df950ea8ddec4188b48f4be73e67442dd3c01 (patch)
tree1229dba9763118d7f1c197f397bd006634dae987 /meta/recipes-support/curl
parent6bdd2311e662629d021c89f68dc63b33f8eec532 (diff)
downloadpoky-a09df950ea8ddec4188b48f4be73e67442dd3c01.tar.gz
curl: Reenable auth support for native and nativesdk
148de08220c0ad390ec533e452cbaad7a9338204 adapted the recipe to accomodate the newly introduced configure options for the various authentication schemes supported by curl. However, support for these was not added for the -native and -nativesdk variants of the recipe. Fix this and introduce a PACKAGECONFIG variable for the flags common to all recipe variants to avoid such regressions in the future. (From OE-Core rev: 5b91a092216fa29c944dd1f2d4cc237cac47929e) Signed-off-by: Philip Lorenz <philip.lorenz@bmw.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl_8.8.0.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-support/curl/curl_8.8.0.bb b/meta/recipes-support/curl/curl_8.8.0.bb
index 2b058e4e82..533c2ac199 100644
--- a/meta/recipes-support/curl/curl_8.8.0.bb
+++ b/meta/recipes-support/curl/curl_8.8.0.bb
@@ -25,9 +25,10 @@ inherit autotools pkgconfig binconfig multilib_header ptest
25# Entropy source for random PACKAGECONFIG option 25# Entropy source for random PACKAGECONFIG option
26RANDOM ?= "/dev/urandom" 26RANDOM ?= "/dev/urandom"
27 27
28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random threaded-resolver verbose zlib" 28COMMON_PACKAGECONFIG = "basic-auth bearer-auth digest-auth negotiate-auth openssl proxy random threaded-resolver verbose zlib"
29PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib" 29PACKAGECONFIG ??= "${COMMON_PACKAGECONFIG} ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws libidn"
30PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib" 30PACKAGECONFIG:class-native = "${COMMON_PACKAGECONFIG} ipv6"
31PACKAGECONFIG:class-nativesdk = "${COMMON_PACKAGECONFIG} ipv6"
31 32
32# 'ares' and 'threaded-resolver' are mutually exclusive 33# 'ares' and 'threaded-resolver' are mutually exclusive
33PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" 34PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver"