From 2d7622c1dd65ee6402be461829ede3e8408bdc27 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 2 Feb 2016 14:12:33 -0800 Subject: gnutls.inc: allow libidn support to be controlled via PACKAGECONFIG libidn (Internationalized Domain Name support library) may not be desired in all cases, so add a PACKAGECONFIG option to control it. Allow --enable-doc, libtasn1 internal -vs- external (still internal by default) and p11-kit support to be controlled via PACKAGECONFIG too. (From OE-Core rev: cdce5b95fef7a557333c220ad40b7341cbe2624a) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/gnutls.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 2c6a8da390..e7c91eb804 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -11,7 +11,7 @@ LICENSE_${PN}-openssl = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" -DEPENDS = "nettle gmp libidn virtual/libiconv" +DEPENDS = "nettle gmp virtual/libiconv" DEPENDS_append_libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" @@ -20,20 +20,23 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" inherit autotools texinfo binconfig pkgconfig gettext lib_package -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "libidn zlib" +PACKAGECONFIG[docs] = "--enable-doc,--disable-doc" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" +PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" +PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF = " \ --disable-crywrap \ + --disable-libdane \ --disable-guile \ --disable-rpath \ --enable-local-libopts \ --enable-openssl-compatibility \ - --with-included-libtasn1 \ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ - --without-p11-kit \ " LDFLAGS_append_libc-musl = " -largp" -- cgit v1.2.3-54-g00ecf