From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 9AB9F7FA17 for ; Thu, 12 Dec 2019 18:14:52 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id b11so3407517wmj.4 for ; Thu, 12 Dec 2019 10:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AfL66+o8hezhHUuX7wH0MfkFnz0d9nbPd/rnbiFD340=; b=Qx49ylOhCnEgIYLklVRSBGc1c6A7Ko1uNr8KBAhuZDWNaYTv+Vx3ePDA7X8+K7KMmd jXdNM9f9oC2y/FZAFsCu/hR2fyeKhiRVk633i24poPiug8pM7fNzepgl2IIOMXHmsNx7 c25fhowXhjdXSsn+wBE1XlcJyOKcnVHjApFEumFypcEDnT0cjHRPhtBPsEF71afuCy2D pM8BefXwLs3lq34YtFRRFVFRp1miUvrdVSUyiYR9qEwDdzG9scA86IfXOWTabmQPDpKN uN/TJAIznU6p6F/BiDerULrA7STlVPFSRZdT08M/94/fxjs2a3ESWguzCqZmQ+uxEZHS EwuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AfL66+o8hezhHUuX7wH0MfkFnz0d9nbPd/rnbiFD340=; b=Q1UDp8hdyTIhgEm1zxJT3b4LrxnXn4tnecHHMrkFDEm6V/dPviEoSSV4hIno53yhK1 6pQzSo5K0HSwRvj2spH32y9L84y+V3ZwAJueEbLJeWKb9rPv/oIHBVNNtfbGvopKUNnU 3KVo3LM/Z7gkcHVDxUMgX6oNH66nkznFJ/anP7due3ZQdPG5s97mcj+6yaFz29rLatSi HQfzTAH6ipRop9pd3dVOnH7/FEo/nule37G9JMUyuQVLSdghx9dV62tKiLj3xUBOzE2t rpbWvyO9ZK+KZYzOMMSfWK2qg7BCMnzTlZWwib5BUOaTo9qDji/VtPlvR3IxUgH4d/g4 Ugew== X-Gm-Message-State: APjAAAVJ1z5RWWGNtJNX6YTQnw87zN43BF7u2UxhDH0MROk2i1dc6/07 T+X+b4ME0zNCj7l6XE+Fif8bcaQ8 X-Google-Smtp-Source: APXvYqzDY01WwpzxOCiPKB3WfbOf0JlG5999MWJglIP0QNfWbkc+cRkW93WHjGKMWXa53sUJTsbNVg== X-Received: by 2002:a1c:628b:: with SMTP id w133mr3976570wmb.25.1576174493199; Thu, 12 Dec 2019 10:14:53 -0800 (PST) Received: from alexander-box.rd.corpintra.net ([141.113.66.202]) by smtp.gmail.com with ESMTPSA id o66sm3147571wmo.20.2019.12.12.10.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 10:14:52 -0800 (PST) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 12 Dec 2019 19:14:16 +0100 Message-Id: <20191212181436.1322-10-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191212181436.1322-1-alex.kanavin@gmail.com> References: <20191212181436.1322-1-alex.kanavin@gmail.com> MIME-Version: 1.0 Subject: [PATCH 10/30] libtasn1: update to 4.15.0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2019 18:14:53 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop backports. Signed-off-by: Alexander Kanavin --- .../gnutls/libtasn1/fix-gtkdoc.patch | 38 ------------------- .../gnutls/libtasn1/fix-ldflags.patch | 31 --------------- .../{libtasn1_4.14.bb => libtasn1_4.15.0.bb} | 11 ++++-- 3 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch rename meta/recipes-support/gnutls/{libtasn1_4.14.bb => libtasn1_4.15.0.bb} (72%) diff --git a/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted file mode 100644 index bfc9b9fca7e..00000000000 --- a/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] -Signed-off-by: Ross Burton - -From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Mon, 9 Sep 2019 13:11:39 +0100 -Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter - -The object hierarchy section is empty because there are no GObjects in the -libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object -hierarchy file won't exist, resulting in a failure when building the -documentation: - -| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found - -Signed-off-by: Ross Burton ---- - doc/reference/libtasn1-docs.xml | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml -index accdb85..f88b888 100644 ---- a/doc/reference/libtasn1-docs.xml -+++ b/doc/reference/libtasn1-docs.xml -@@ -34,10 +34,6 @@ - - - -- -- Object Hierarchy -- -- - - API Index - --- -2.20.1 - diff --git a/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch b/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted file mode 100644 index f18f3c62679..00000000000 --- a/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Tue, 23 Jul 2019 20:44:01 +0200 -Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tim Rühsen -Upstream-Status: Backport -Signed-off-by: Anuj Mittal ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5bf3622..4459767 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \ - -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS) - - LDADD = ../lib/libtasn1.la --LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - - bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding - --- -2.21.0 - diff --git a/meta/recipes-support/gnutls/libtasn1_4.14.bb b/meta/recipes-support/gnutls/libtasn1_4.15.0.bb similarity index 72% rename from meta/recipes-support/gnutls/libtasn1_4.14.bb rename to meta/recipes-support/gnutls/libtasn1_4.15.0.bb index ef2c1956a24..398faa29a86 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.14.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.15.0.bb @@ -10,15 +10,18 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ - file://fix-ldflags.patch \ - file://fix-gtkdoc.patch \ " DEPENDS = "bison-native" -SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" -SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" +SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8" +SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e" inherit autotools texinfo lib_package gtk-doc +do_install_append () { + # this utility has a bogus RPATH + chrpath -d ${D}/${bindir}/corpus2array +} + BBCLASSEXTEND = "native nativesdk" -- 2.17.1