[PATCH] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG

[PATCH] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG

[Alex Kiernan]

Convert existing EXTRA_OECONF and DEPENDS to PACKAGECONFIG, fill out
remaining PACKAGECONFIG options. Note we pass in --without-libpsl, which
we didn't previously, but all this actually ends up doing is silencing a
warning from the configure script, the code still uses an internal
implemention when using this option.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

 meta/recipes-extended/wget/wget.inc | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 3cff656a68d9..99af039f417a 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -3,12 +3,11 @@ HOMEPAGE = "https://www.gnu.org/software/wget/"
 SECTION = "console/network"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
-DEPENDS = "gnutls zlib libpcre"
 
 inherit autotools gettext texinfo update-alternatives pkgconfig
 
-EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \
-                --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no"
+EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
+                --disable-rpath ac_cv_header_uuid_uuid_h=no"
 
 EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \
                  DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"'
@@ -21,9 +20,17 @@ RRECOMMENDS_${PN} += "ca-certificates"
 
 BBCLASSEXTEND = "nativesdk"
 
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
-PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux"
+PACKAGECONFIG ??= "gnutls pcre zlib \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG[ares] = "--with-cares,,c-ares"
+PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[iri] = ",--disable-iri,libidn2"
+PACKAGECONFIG[libpsl] = ",--without-libpsl,libpsl"
+PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
+PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
+PACKAGECONFIG[pcre] = ",--disable-pcre,libpcre"
+PACKAGECONFIG[zlib] = ",--without-zlib,zlib"
 
 # Let aclocal use the relative path for the m4 file rather than
 # absolute, otherwise there might be an "Argument list too long" error
-- 
2.7.4

Re: [PATCH] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG

[Adrian Bunk]

On Sat, Mar 23, 2019 at 08:29:51PM +0000, Alex Kiernan wrote:
> Convert existing EXTRA_OECONF and DEPENDS to PACKAGECONFIG, fill out
> remaining PACKAGECONFIG options. Note we pass in --without-libpsl, which
> we didn't previously, but all this actually ends up doing is silencing a
> warning from the configure script, the code still uses an internal
> implemention when using this option.
> 
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
> ---
> 
>  meta/recipes-extended/wget/wget.inc | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
> index 3cff656a68d9..99af039f417a 100644
> --- a/meta/recipes-extended/wget/wget.inc
> +++ b/meta/recipes-extended/wget/wget.inc
>...
> -EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \
> -                --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no"
> +EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
> +                --disable-rpath ac_cv_header_uuid_uuid_h=no"
>...
> +PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
>...

Can't the ac_cv_header_uuid_uuid_h hack be removed when this is now 
handled with PACKAGECONFIG?

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG

[Alex Kiernan]

On Sun, Mar 24, 2019 at 8:50 AM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Sat, Mar 23, 2019 at 08:29:51PM +0000, Alex Kiernan wrote:
> > Convert existing EXTRA_OECONF and DEPENDS to PACKAGECONFIG, fill out
> > remaining PACKAGECONFIG options. Note we pass in --without-libpsl, which
> > we didn't previously, but all this actually ends up doing is silencing a
> > warning from the configure script, the code still uses an internal
> > implemention when using this option.
> >
> > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
> > ---
> >
> >  meta/recipes-extended/wget/wget.inc | 17 ++++++++++++-----
> >  1 file changed, 12 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
> > index 3cff656a68d9..99af039f417a 100644
> > --- a/meta/recipes-extended/wget/wget.inc
> > +++ b/meta/recipes-extended/wget/wget.inc
> >...
> > -EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \
> > -                --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no"
> > +EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
> > +                --disable-rpath ac_cv_header_uuid_uuid_h=no"
> >...
> > +PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
> >...
>
> Can't the ac_cv_header_uuid_uuid_h hack be removed when this is now
> handled with PACKAGECONFIG?
>

Looks like it, I'll have a play.

-- 
Alex Kiernan