libpsl: Extend with native, nativesdk
PATCH v3 1/2 libpsl: Extend with native, nativesdk
To allow wget with libpsl to build native/nativesdk versions we need those variants here.
Signed-off-by Alex Kiernan <[email protected]>
---
Changes in v3: None
Changes in v2:
- new
meta/recipes-support/libpsl/libpsl_0.20.2.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-support/libpsl/libpsl_0.20.2.bb +2 -0
@@ -16,3 +16,5 @@ inherit autotools gettext gtk-doc manpages pkgconfig lib_package PACKAGECONFIG ??= "" PACKAGECONFIG[manpages] = "--enable-man,--disable-man,libxslt-native" + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.7.4
PATCH v3 2/2 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.
Signed-off-by Alex Kiernan <[email protected]>
---
Changes in v3:
- add explicit with/without/enable/disable for all PACKAGECONFIGs
Changes in v2:
- drop ac_cv_header_uuid_uuid_h hack
meta/recipes-extended/wget/wget.inc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
meta/recipes-extended/wget/wget.inc +12 -5
@@ -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" 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,--without-cares,c-ares" +PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[iri] = "--enable-iri,--disable-iri,libidn2" +PACKAGECONFIG[libpsl] = "--with-libpsl,--without-libpsl,libpsl" +PACKAGECONFIG[libuuid] = "--with-libuuid,--without-libuuid,util-linux" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" +PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" +PACKAGECONFIG[zlib] = "--with-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
Signature · 1 line
2.7.4