summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-12-19 13:41:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-28 23:25:42 +0000
commit5e0b62675a6373828713b757b3a35d1fb20da264 (patch)
tree3d2424e6cab1bb921b88b7cc73d0e9764c4661fc /meta/recipes-support/gnutls
parent5f7206928e9821ed309a14274f5b7b97c521b18c (diff)
downloadpoky-5e0b62675a6373828713b757b3a35d1fb20da264.tar.gz
libtasn1: upgrade 4.14 -> 4.15.0
Remove backported patches and explicitly pass -std=gnu99 to native CFLAGS to make sure build passes on older and still supported OSes like CentOS 7. (From OE-Core rev: cc84d4dcc775c371389e1d351256946cbd003545) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r--meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch38
-rw-r--r--meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch31
-rw-r--r--meta/recipes-support/gnutls/libtasn1_4.15.0.bb (renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb)8
3 files changed, 4 insertions, 73 deletions
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 bfc9b9fca7..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 9 Sep 2019 13:11:39 +0100
7Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter
8
9The object hierarchy section is empty because there are no GObjects in the
10libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object
11hierarchy file won't exist, resulting in a failure when building the
12documentation:
13
14| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found
15
16Signed-off-by: Ross Burton <ross.burton@intel.com>
17---
18 doc/reference/libtasn1-docs.xml | 4 ----
19 1 file changed, 4 deletions(-)
20
21diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml
22index accdb85..f88b888 100644
23--- a/doc/reference/libtasn1-docs.xml
24+++ b/doc/reference/libtasn1-docs.xml
25@@ -34,10 +34,6 @@
26 <xi:include href="xml/libtasn1.xml"/>
27
28 </chapter>
29- <chapter id="object-tree">
30- <title>Object Hierarchy</title>
31- <xi:include href="xml/tree_index.sgml"/>
32- </chapter>
33 <index id="api-index-full">
34 <title>API Index</title>
35 <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
36--
372.20.1
38
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 f18f3c6267..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
3Date: Tue, 23 Jul 2019 20:44:01 +0200
4Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
10Upstream-Status: Backport
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 src/Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/Makefile.am b/src/Makefile.am
17index 5bf3622..4459767 100644
18--- a/src/Makefile.am
19+++ b/src/Makefile.am
20@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \
21 -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS)
22
23 LDADD = ../lib/libtasn1.la
24-LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
25+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
26
27 bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding
28
29--
302.21.0
31
diff --git a/meta/recipes-support/gnutls/libtasn1_4.14.bb b/meta/recipes-support/gnutls/libtasn1_4.15.0.bb
index ef2c1956a2..115c98ae57 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.14.bb
+++ b/meta/recipes-support/gnutls/libtasn1_4.15.0.bb
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
10 10
11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
12 file://dont-depend-on-help2man.patch \ 12 file://dont-depend-on-help2man.patch \
13 file://fix-ldflags.patch \
14 file://fix-gtkdoc.patch \
15 " 13 "
16 14
17DEPENDS = "bison-native" 15DEPENDS = "bison-native"
18 16
19SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205" 17SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8"
20SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08" 18SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e"
21 19
22inherit autotools texinfo lib_package gtk-doc 20inherit autotools texinfo lib_package gtk-doc
23 21
22CFLAGS_append_class-native = " -std=gnu99"
23
24BBCLASSEXTEND = "native nativesdk" 24BBCLASSEXTEND = "native nativesdk"