summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-05-27 11:48:50 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-30 22:25:12 +0100
commitb7c5e813011f30b33702d8d2fbff3bdbd61be742 (patch)
tree402486cc143da2e576cdfc7c998b1693bf64a9e4
parent78a0e916882a747c267808c08ab8bc615198b5a8 (diff)
downloadopenembedded-core-contrib-b7c5e813011f30b33702d8d2fbff3bdbd61be742.tar.gz
openembedded-core-contrib-b7c5e813011f30b33702d8d2fbff3bdbd61be742.tar.bz2
openembedded-core-contrib-b7c5e813011f30b33702d8d2fbff3bdbd61be742.zip
gnutls: control zlib support via PACKAGECONFIG
Remains enabled by default, no functional change. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc5
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 @@
SUMMARY = "GNU Transport Layer Security Library"
HOMEPAGE = "http://www.gnu.org/software/gnutls/"
BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib nettle"
+DEPENDS = "nettle"
LICENSE = "GPLv3+ & LGPLv2.1+"
LICENSE_${PN} = "LGPLv2.1+"
@@ -34,8 +34,9 @@ do_configure_prepend() {
done
}
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "zlib"
PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers"
+PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib"
PACKAGES =+ "${PN}-openssl ${PN}-xx"