diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2016-08-22 17:06:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-03 23:45:53 +0100 |
commit | c0ea54db73c8e33fd6f5cbf5c47e73568bed2a35 (patch) | |
tree | 92eab734dc9692168fe1245639a75c93225ed9a5 /meta/recipes-extended/wget | |
parent | 4d0ab9cd8e330291659e50d8405a8c568165f1b4 (diff) | |
download | poky-c0ea54db73c8e33fd6f5cbf5c47e73568bed2a35.tar.gz |
wget: control ipv6 support based on DISTRO_FEATURES
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES instead of unconditionally enabled.
(From OE-Core rev: ab699155f2fa6f19b4020e7d1c2097e867d9e977)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/wget')
-rw-r--r-- | meta/recipes-extended/wget/wget.inc | 5 |
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" | |||
9 | 9 | ||
10 | inherit autotools gettext texinfo update-alternatives pkgconfig | 10 | inherit autotools gettext texinfo update-alternatives pkgconfig |
11 | 11 | ||
12 | EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \ | 12 | EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \ |
13 | --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" | 13 | --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" |
14 | 14 | ||
15 | ALTERNATIVE_${PN} = "wget" | 15 | ALTERNATIVE_${PN} = "wget" |
@@ -20,8 +20,9 @@ RRECOMMENDS_${PN} += "ca-certificates" | |||
20 | 20 | ||
21 | BBCLASSEXTEND += "nativesdk" | 21 | BBCLASSEXTEND += "nativesdk" |
22 | 22 | ||
23 | PACKAGECONFIG ??= "" | 23 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" |
24 | PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" | 24 | PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" |
25 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
25 | 26 | ||
26 | # Let aclocal use the relative path for the m4 file rather than | 27 | # Let aclocal use the relative path for the m4 file rather than |
27 | # absolute, otherwise there might be an "Argument list too long" error | 28 | # absolute, otherwise there might be an "Argument list too long" error |