From patchwork Fri Jan 6 07:56:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,02/25] gnutls: remove gettext patch for non-GPLv3 Date: Fri, 06 Jan 2012 07:56:13 -0000 From: Saul Wold X-Patchwork-Id: 18539 Message-Id: <2b38b62490d564d910c0c2f69937f1b06da9a8d4.1325836241.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org 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. Signed-off-by: Saul Wold --- meta/recipes-support/gnutls/gnutls_2.12.14.bb | 13 ++++++++++--- 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 045ba69..21fd187 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 @@ require gnutls.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "file://gnutls-openssl.patch \ - file://configure-fix.patch \ - file://fix-gettext-version.patch" + file://configure-fix.patch" + +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)) +} SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c" SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"