aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-08-22 17:06:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:45 +0100
commitab699155f2fa6f19b4020e7d1c2097e867d9e977 (patch)
treeb8341cb2c92590a63f17fd18e2ac0c5fe938dfa3
parent0a6d496d31383682dbe842b681dc148de1c3158d (diff)
downloadopenembedded-core-contrib-ab699155f2fa6f19b4020e7d1c2097e867d9e977.tar.gz
openembedded-core-contrib-ab699155f2fa6f19b4020e7d1c2097e867d9e977.tar.bz2
openembedded-core-contrib-ab699155f2fa6f19b4020e7d1c2097e867d9e977.zip
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 <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/wget/wget.inc5
1 files 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