[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2231/8267] wget: control ipv6 support based on DISTRO_FEATURES



commit c0ea54db73c8e33fd6f5cbf5c47e73568bed2a35
Author: Jackie Huang <jackie huang windriver com>
Date:   Mon Aug 22 17:06:08 2016 +0800

    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>

 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 dc381a6..c4abfe4 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]