From 5b91a092216fa29c944dd1f2d4cc237cac47929e Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Mon, 5 Aug 2024 10:04:39 +0200 Subject: [PATCH] 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. Signed-off-by: Philip Lorenz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_8.8.0.bb | 7 ++++--- 1 file 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 2b058e4e82d..533c2ac199b 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 # Entropy source for random PACKAGECONFIG option RANDOM ?= "/dev/urandom" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random threaded-resolver verbose zlib" -PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib" -PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib" +COMMON_PACKAGECONFIG = "basic-auth bearer-auth digest-auth negotiate-auth openssl proxy random threaded-resolver verbose zlib" +PACKAGECONFIG ??= "${COMMON_PACKAGECONFIG} ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws libidn" +PACKAGECONFIG:class-native = "${COMMON_PACKAGECONFIG} ipv6" +PACKAGECONFIG:class-nativesdk = "${COMMON_PACKAGECONFIG} ipv6" # 'ares' and 'threaded-resolver' are mutually exclusive PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" -- 2.47.3