Just use the gettext class to simplify the enable/disabling of NLS
support.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta-oe/recipes-support/neon/neon_0.33.0.bb | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-support/neon/neon_0.33.0.bb
b/meta-oe/recipes-support/neon/neon_0.33.0.bb
index 0b8bee0efe..4c6ed00827 100644
--- a/meta-oe/recipes-support/neon/neon_0.33.0.bb
+++ b/meta-oe/recipes-support/neon/neon_0.33.0.bb
@@ -13,21 +13,19 @@ SRC_URI =
"${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
SRC_URI[sha256sum] =
"659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
-inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest
+inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest
gettext
EXTRA_AUTORECONF += "-I macros"
# Enable gnutls or openssl, not both
-PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls"
-PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls"
-PACKAGECONFIG:remove:libc-musl = "nls"
+PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
+PACKAGECONFIG:class-native = "expat gnutls webdav zlib"
PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
-PACKAGECONFIG[nls] = ",--disable-nls,gettext-native"
PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
@@ -42,7 +40,7 @@ do_configure:prepend() {
}
do_compile:append() {
- if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then
+ if ${@bb.utils.contains('USE_NLS', 'yes', 'true', 'false', d)}; then
oe_runmake compile-gmo
fi
oe_runmake -C test
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#115668):
https://lists.openembedded.org/g/openembedded-devel/message/115668
Mute This Topic: https://lists.openembedded.org/mt/111398043/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
