diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-05-27 11:48:50 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-30 22:26:13 +0100 |
commit | 1d22b56992b6579847207b97122ad09055d0e3b0 (patch) | |
tree | 8f3bb7c61a3b714ca13ccf53b15878c66cf47384 /meta/recipes-support/gnutls | |
parent | 1a180b63d85e0c35dc2355ae0052e3eb1aae1368 (diff) | |
download | poky-1d22b56992b6579847207b97122ad09055d0e3b0.tar.gz |
gnutls: control zlib support via PACKAGECONFIG
Remains enabled by default, no functional change.
(From OE-Core rev: b7c5e813011f30b33702d8d2fbff3bdbd61be742)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 87f275a8da..e9b138a03b 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "GNU Transport Layer Security Library" | 1 | SUMMARY = "GNU Transport Layer Security Library" |
2 | HOMEPAGE = "http://www.gnu.org/software/gnutls/" | 2 | HOMEPAGE = "http://www.gnu.org/software/gnutls/" |
3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" | 3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" |
4 | DEPENDS = "zlib nettle" | 4 | DEPENDS = "nettle" |
5 | 5 | ||
6 | LICENSE = "GPLv3+ & LGPLv2.1+" | 6 | LICENSE = "GPLv3+ & LGPLv2.1+" |
7 | LICENSE_${PN} = "LGPLv2.1+" | 7 | LICENSE_${PN} = "LGPLv2.1+" |
@@ -34,8 +34,9 @@ do_configure_prepend() { | |||
34 | done | 34 | done |
35 | } | 35 | } |
36 | 36 | ||
37 | PACKAGECONFIG ??= "" | 37 | PACKAGECONFIG ??= "zlib" |
38 | PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers" | 38 | PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers" |
39 | PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib" | ||
39 | 40 | ||
40 | PACKAGES =+ "${PN}-openssl ${PN}-xx" | 41 | PACKAGES =+ "${PN}-openssl ${PN}-xx" |
41 | 42 | ||