From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SoGMo-00065I-Mu for openembedded-core@lists.openembedded.org; Mon, 09 Jul 2012 17:59:18 +0200 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 09 Jul 2012 08:48:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="190292926" Received: from unknown (HELO swold-mobl.bigsur.com) ([10.255.12.157]) by fmsmga002.fm.intel.com with ESMTP; 09 Jul 2012 08:48:02 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Mon, 9 Jul 2012 08:47:42 -0700 Message-Id: X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 28/41] gnutls: make sure native is patched for gettext version X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 15:59:19 -0000 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)) -} -- 1.7.7.6