]> code.ossystems Code Review - openembedded-core.git/commitdiff
wget: control ipv6 support based on DISTRO_FEATURES
authorJackie Huang <jackie.huang@windriver.com>
Mon, 22 Aug 2016 09:06:08 +0000 (17:06 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 3 Sep 2016 22:45:45 +0000 (23:45 +0100)
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES instead of unconditionally enabled.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/wget/wget.inc

index dc381a628004dae098ddadb4ff695c51769dc420..c4abfe490e0dedb750d81387f55de0a1e72070a9 100644 (file)
@@ -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