From f22c29226169e6f7cade67cf48f0ac67c1ae4822 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 4 Jan 2012 14:27:18 -0800 Subject: gnutls: remove gettext patch for non-GPLv3 GPLv2 version of gnutls does not need the gettext 0.18 patch since it still uses the over version of gettext that is also GPLv2. (From OE-Core rev: 70dc38b1e127524f50f661c5dd4b3225ddb0b36b) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/gnutls_2.12.14.bb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb index 045ba69d1b..21fd187285 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb @@ -1,10 +1,17 @@ require gnutls.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "file://gnutls-openssl.patch \ - file://configure-fix.patch \ - file://fix-gettext-version.patch" + file://configure-fix.patch" + +python() { + if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1): + # if GPLv3 add patch + src_uri = (d.getVar("SRC_URI", False) or "").split() + src_uri.append("file://fix-gettext-version.patch") + d.setVar("SRC_URI", " ".join(src_uri)) +} SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c" SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3" -- cgit v1.2.3-54-g00ecf