summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-02 14:12:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:39:02 +0000
commit2d7622c1dd65ee6402be461829ede3e8408bdc27 (patch)
tree33c449b9d334a993fe42eca8948fd9167f588c03
parent60ebe1c68bfcda18d00fa7329814728702c6d9fd (diff)
downloadpoky-2d7622c1dd65ee6402be461829ede3e8408bdc27.tar.gz
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 <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc11
1 files changed, 7 insertions, 4 deletions
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+"
11LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
12 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" 12 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
13 13
14DEPENDS = "nettle gmp libidn virtual/libiconv" 14DEPENDS = "nettle gmp virtual/libiconv"
15DEPENDS_append_libc-musl = " argp-standalone" 15DEPENDS_append_libc-musl = " argp-standalone"
16 16
17SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" 17SHRT_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"
20 20
21inherit autotools texinfo binconfig pkgconfig gettext lib_package 21inherit autotools texinfo binconfig pkgconfig gettext lib_package
22 22
23PACKAGECONFIG ??= "zlib" 23PACKAGECONFIG ??= "libidn zlib"
24 24
25PACKAGECONFIG[docs] = "--enable-doc,--disable-doc"
26PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
27PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1"
28PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit"
25PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" 29PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
26PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" 30PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
27 31
28EXTRA_OECONF = " \ 32EXTRA_OECONF = " \
29 --disable-crywrap \ 33 --disable-crywrap \
34 --disable-libdane \
30 --disable-guile \ 35 --disable-guile \
31 --disable-rpath \ 36 --disable-rpath \
32 --enable-local-libopts \ 37 --enable-local-libopts \
33 --enable-openssl-compatibility \ 38 --enable-openssl-compatibility \
34 --with-included-libtasn1 \
35 --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ 39 --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
36 --without-p11-kit \
37" 40"
38 41
39LDFLAGS_append_libc-musl = " -largp" 42LDFLAGS_append_libc-musl = " -largp"