[oe-commits] Saul Wold : gnutls: remove gettext patch for non-GPLv3

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 70dc38b1e127524f50f661c5dd4b3225ddb0b36b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=70dc38b1e127524f50f661c5dd4b3225ddb0b36b

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Jan  4 14:27:18 2012 -0800

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.

Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-support/gnutls/gnutls_2.12.14.bb |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index 045ba69..21fd187 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"