* [PATCH v2 1/2] libpsl: Extend with native, nativesdk @ 2019-03-25 9:37 Alex Kiernan 2019-03-25 9:37 ` [PATCH v2 2/2] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG Alex Kiernan 0 siblings, 1 reply; 3+ messages in thread From: Alex Kiernan @ 2019-03-25 9:37 UTC (permalink / raw) To: openembedded-core To allow wget with libpsl to build native/nativesdk versions we need those variants here. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- Changes in v2: - new meta/recipes-support/libpsl/libpsl_0.20.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/libpsl/libpsl_0.20.2.bb b/meta/recipes-support/libpsl/libpsl_0.20.2.bb index 89a87b67c744..5cb20d46bc48 100644 --- a/meta/recipes-support/libpsl/libpsl_0.20.2.bb +++ b/meta/recipes-support/libpsl/libpsl_0.20.2.bb @@ -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" -- 2.7.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG 2019-03-25 9:37 [PATCH v2 1/2] libpsl: Extend with native, nativesdk Alex Kiernan @ 2019-03-25 9:37 ` Alex Kiernan 2019-03-25 11:41 ` Burton, Ross 0 siblings, 1 reply; 3+ messages in thread From: Alex Kiernan @ 2019-03-25 9:37 UTC (permalink / raw) To: openembedded-core 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 <alex.kiernan@gmail.com> --- 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(-) diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 3cff656a68d9..2f63e2138595 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" 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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 2/2] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG 2019-03-25 9:37 ` [PATCH v2 2/2] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG Alex Kiernan @ 2019-03-25 11:41 ` Burton, Ross 0 siblings, 0 replies; 3+ messages in thread From: Burton, Ross @ 2019-03-25 11:41 UTC (permalink / raw) To: Alex Kiernan; +Cc: OE-core On Mon, 25 Mar 2019 at 09:38, Alex Kiernan <alex.kiernan@gmail.com> wrote: > +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" Defaults can and do change, so please be explicit here: always pass ---with-foo and --without-foo. Ross ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-25 11:41 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-03-25 9:37 [PATCH v2 1/2] libpsl: Extend with native, nativesdk Alex Kiernan 2019-03-25 9:37 ` [PATCH v2 2/2] wget: Convert EXTRA_OECONF to PACKAGECONFIG, extend PACKAGECONFIG Alex Kiernan 2019-03-25 11:41 ` Burton, Ross
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.