summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2019-03-25 13:27:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-26 14:02:09 +0000
commitf26680fad518a49259fe9689e476edec832d770c (patch)
treeb943dd43e23c2cc502fb127cb28bd83dfaf6220f /meta
parent7f98d0ffaf305fff5afb684f251d98a4cec61f23 (diff)
downloadpoky-f26680fad518a49259fe9689e476edec832d770c.tar.gz
wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG
Convert existing EXTRA_OECONF and DEPENDS to PACKAGECONFIG, fill out remaining PACKAGECONFIG options. When building without libpsl 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. (From OE-Core rev: 6472261c7dba1ecc67d639d13b7cf04258f13c7c) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/wget/wget.inc17
1 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 3cff656a68..07e8d8e871 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/"
3SECTION = "console/network" 3SECTION = "console/network"
4LICENSE = "GPLv3" 4LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" 5LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
6DEPENDS = "gnutls zlib libpcre"
7 6
8inherit autotools gettext texinfo update-alternatives pkgconfig 7inherit autotools gettext texinfo update-alternatives pkgconfig
9 8
10EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \ 9EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \
11 --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" 10 --disable-rpath"
12 11
13EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \ 12EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \
14 DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"' 13 DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"'
@@ -21,9 +20,17 @@ RRECOMMENDS_${PN} += "ca-certificates"
21 20
22BBCLASSEXTEND = "nativesdk" 21BBCLASSEXTEND = "nativesdk"
23 22
24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 23PACKAGECONFIG ??= "gnutls pcre zlib \
25PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" 24 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
25PACKAGECONFIG[ares] = "--with-cares,--without-cares,c-ares"
26PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
26PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 27PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
28PACKAGECONFIG[iri] = "--enable-iri,--disable-iri,libidn2"
29PACKAGECONFIG[libpsl] = "--with-libpsl,--without-libpsl,libpsl"
30PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux"
31PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
32PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
33PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
27 34
28# Let aclocal use the relative path for the m4 file rather than 35# Let aclocal use the relative path for the m4 file rather than
29# absolute, otherwise there might be an "Argument list too long" error 36# absolute, otherwise there might be an "Argument list too long" error