From patchwork Mon Jul 9 15:47:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 28/41] gnutls: make sure native is patched for gettext version Date: Mon, 09 Jul 2012 15:47:42 -0000 From: Saul Wold X-Patchwork-Id: 31479 Message-Id: To: openembedded-core@lists.openembedded.org Signed-off-by: Saul Wold --- meta/recipes-support/gnutls/gnutls_2.12.20.bb | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) 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)) -}