[oe] [PATCH] curl: make CURL_FEATURES configurable again

Khem Raj raj.khem at gmail.com
Thu Oct 28 18:30:56 UTC 2010


On Thu, Oct 28, 2010 at 10:22 AM, Michael Smith <msmith at cbnco.com> wrote:
> Lock down CURL_FEATURES for virtclass-native, but make CURL_FEATURES
> for target a weak assignment.
>
> Signed-off-by: Michael Smith <msmith at cbnco.com>
> ---
>  recipes/curl/curl-common.inc |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
> index ddaebb8..8ffefeb 100644
> --- a/recipes/curl/curl-common.inc
> +++ b/recipes/curl/curl-common.inc
> @@ -6,9 +6,10 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \
>            file://pkgconfig_fix.patch"
>  S = "${WORKDIR}/curl-${PV}"
>
> -INC_PR = "r4"
> +INC_PR = "r5"
>
> -CURL_FEATURES = ${@['zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp','zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp']["${BPN}" == "${PN}"]}
> +CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
> +CURL_FEATURES_virtclass-native = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"

this change was done for a reason. this will not set correct override
for native recipes and
we dont want gnutls on native recipe but if you look closely the
output then it will enable gnutls
because CURL_FEATURES_virtclass-native is ineffective in this case as
you already have a
weak assignment.

This was the reason why I proposed my fix for having recipe type
OVERRIDE but unfortunately
that patch has different issue which prevents it from being applied.

>  # other allowed features: ipv6, ares, openssl
>
>  inherit autotools pkgconfig binconfig
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>




More information about the Openembedded-devel mailing list