gnutls: make sure native is patched for gettext version
authorSaul Wold <sgw@linux.intel.com>
Thu, 5 Jul 2012 21:31:15 +0000 (14:31 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 9 Jul 2012 10:38:02 +0000 (11:38 +0100)
(From OE-Core rev: 92ede8a994b9a24387d3d7dc79e80705f6be4524)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-support/gnutls/gnutls_2.12.20.bb

index 248c90f..010f179 100644 (file)
@@ -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))
-}