summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-04 14:27:18 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-06 12:11:30 +0000
commitf22c29226169e6f7cade67cf48f0ac67c1ae4822 (patch)
treef20a4cbe7abdd1656976c250c834f6a02ba0816c /meta/recipes-support/gnutls
parent815c7e8e83c424510bb2b012f2839f10316f467a (diff)
downloadpoky-f22c29226169e6f7cade67cf48f0ac67c1ae4822.tar.gz
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 <sgw@linux.intel.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_2.12.14.bb13
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 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 @@
1require gnutls.inc 1require gnutls.inc
2 2
3PR = "${INC_PR}.3" 3PR = "${INC_PR}.4"
4 4
5SRC_URI += "file://gnutls-openssl.patch \ 5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch \ 6 file://configure-fix.patch"
7 file://fix-gettext-version.patch" 7
8python() {
9 if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
10 # if GPLv3 add patch
11 src_uri = (d.getVar("SRC_URI", False) or "").split()
12 src_uri.append("file://fix-gettext-version.patch")
13 d.setVar("SRC_URI", " ".join(src_uri))
14}
8 15
9SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c" 16SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
10SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3" 17SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"