Patchwork [CONSOLIDATED,PULL,28/41] gnutls: make sure native is patched for gettext version

login
register
mail settings
Submitter Saul Wold
Date July 9, 2012, 3:47 p.m.
Message ID <f68de2f58571e53066a1f0d198cbfbc3d913a5ff.1341802889.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/31479/
State New
Headers show

Comments

Saul Wold - July 9, 2012, 3:47 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/gnutls/gnutls_2.12.20.bb |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

Patch

diff --git a/meta/recipes-support/gnutls/gnutls_2.12.20.bb b/meta/recipes-support/gnutls/gnutls_2.12.20.bb
index 248c90f..010f179 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.20.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.20.bb
@@ -5,15 +5,8 @@  PR = "${INC_PR}.0"
 SRC_URI += "file://gnutls-openssl.patch \
             file://correct_rpl_gettimeofday_signature.patch \
             file://configure-fix.patch \
+            ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
            "
 
 SRC_URI[md5sum] = "f1dea97da5d4dcdbc675720c9aad9ee3"
 SRC_URI[sha256sum] = "4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564"
-
-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))
-}