summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/neon/neon_0.33.0.bb10
1 files 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 \
13 13
14SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" 14SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
15 15
16inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest 16inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest gettext
17 17
18EXTRA_AUTORECONF += "-I macros" 18EXTRA_AUTORECONF += "-I macros"
19 19
20# Enable gnutls or openssl, not both 20# Enable gnutls or openssl, not both
21PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls" 21PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
22PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls" 22PACKAGECONFIG:class-native = "expat gnutls webdav zlib"
23PACKAGECONFIG:remove:libc-musl = "nls"
24 23
25PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" 24PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
26PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" 25PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
27PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" 26PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
28PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" 27PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
29PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" 28PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
30PACKAGECONFIG[nls] = ",--disable-nls,gettext-native"
31PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" 29PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
32PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," 30PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
33PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" 31PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
@@ -42,7 +40,7 @@ do_configure:prepend() {
42} 40}
43 41
44do_compile:append() { 42do_compile:append() {
45 if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then 43 if ${@bb.utils.contains('USE_NLS', 'yes', 'true', 'false', d)}; then
46 oe_runmake compile-gmo 44 oe_runmake compile-gmo
47 fi 45 fi
48 oe_runmake -C test 46 oe_runmake -C test