diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2016-02-02 14:12:33 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:35:05 +0000 |
| commit | cdce5b95fef7a557333c220ad40b7341cbe2624a (patch) | |
| tree | 2abc3bf1e8bd0d2ea3a267a4d5e120cd8f705330 /meta/recipes-support/gnutls | |
| parent | 584aba196c31520da7a9ece6d1b99442bbb3bd39 (diff) | |
| download | openembedded-core-contrib-cdce5b95fef7a557333c220ad40b7341cbe2624a.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.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls')
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 2c6a8da3903..e7c91eb804b 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" |