summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls/gnutls.inc
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2017-11-21 12:01:32 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:25:32 +0000
commit452fa2df2f2d12e8675925cb04dc4ad9311667a1 (patch)
tree2b73cf9da8ef7bc433ae3f43af0028c4e74e52e2 /meta/recipes-support/gnutls/gnutls.inc
parenta52a7c33472b73e7c55ba0ffc56f4e87ad61931f (diff)
downloadpoky-452fa2df2f2d12e8675925cb04dc4ad9311667a1.tar.gz
gnutls: update to 3.6.1
zlib configure.ac support removed in 3.6.1 drop patch (From OE-Core rev: 537325f204f2f7c66f13a12dc8fc08f8e16e4754) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls.inc')
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 29b5dd6ae7..7bcb9133ad 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
21 21
22inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc 22inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc
23 23
24PACKAGECONFIG ??= "libidn zlib" 24PACKAGECONFIG ??= "libidn"
25 25
26# You must also have CONFIG_SECCOMP enabled in the kernel for 26# You must also have CONFIG_SECCOMP enabled in the kernel for
27# seccomp to work. 27# seccomp to work.
@@ -32,7 +32,6 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
32PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" 32PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1"
33PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" 33PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit"
34PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" 34PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
35PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
36 35
37EXTRA_OECONF = " \ 36EXTRA_OECONF = " \
38 --enable-doc \ 37 --enable-doc \