From 9e09992b07fc4bc52ddba8a335ffd46b908aca1a Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 22 Aug 2016 17:06:08 +0800 Subject: wget: control ipv6 support based on DISTRO_FEATURES Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES instead of unconditionally enabled. Signed-off-by: Jackie Huang Signed-off-by: Richard Purdie --- meta/recipes-extended/wget/wget.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index dc381a6280..c4abfe490e 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -9,7 +9,7 @@ INC_PR = "r16" inherit autotools gettext texinfo update-alternatives pkgconfig -EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \ +EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \ --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" ALTERNATIVE_${PN} = "wget" @@ -20,8 +20,9 @@ RRECOMMENDS_${PN} += "ca-certificates" BBCLASSEXTEND += "nativesdk" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # Let aclocal use the relative path for the m4 file rather than # absolute, otherwise there might be an "Argument list too long" error -- cgit 1.2.3-korg