summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-28 10:25:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-29 13:04:48 +0000
commit5ec5a0edd804db62e10bb7daef9e890cd79bea2e (patch)
tree655ff8d8ad2a9e3f0a308fae8eb9f7a433f80f55 /meta
parent8f1c60d4bf037b5024c1def8ae1d38d80400b4ae (diff)
downloadpoky-5ec5a0edd804db62e10bb7daef9e890cd79bea2e.tar.gz
libgpg-error: upgrade 1.36 -> 1.37
(From OE-Core rev: 1038aaee556f32516129a536772850e5a401a331) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch27
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch144
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.37.bb (renamed from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb)8
3 files changed, 31 insertions, 148 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
new file mode 100644
index 0000000000..a0ab4f23ff
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
@@ -0,0 +1,27 @@
1From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 28 Feb 2020 09:19:56 +0000
4Subject: [PATCH] Do not fail when testing config scripts
5
6In previous versions this was not a hard a failure, and so went
7unnoticed. The test is unsuitable for building with sysroots anyway as the
8failure is due to that.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/Makefile.am | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/src/Makefile.am b/src/Makefile.am
17index 9303954..7630540 100644
18--- a/src/Makefile.am
19+++ b/src/Makefile.am
20@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old
21 else \
22 echo "no"; \
23 echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
24- exit 1; \
25 fi
26 cp gpg-error-config-old $@
27
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
deleted file mode 100644
index b936d1143b..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1Upstream-Status: Backport [https://dev.gnupg.org/T4459]
2Signed-off-by: Khem Raj <raj.khem@gmail.com>
3
4From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
5From: NIIBE Yutaka <gniibe@fsij.org>
6Date: Mon, 15 Apr 2019 15:10:44 +0900
7Subject: [PATCH] awk: Prepare for Gawk 5.0.
8
9* src/Makefile.am: Use pkg_namespace (instead of namespace).
10* src/mkerrnos.awk: Likewise.
11* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
12* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
13
14--
15
16In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
17which only allows escaping specific characters.
18
19GnuPG-bug-id: 4459
20Reported-by: Marius Schamschula
21Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
22---
23 lang/cl/mkerrcodes.awk | 2 +-
24 src/Makefile.am | 2 +-
25 src/mkerrcodes.awk | 2 +-
26 src/mkerrcodes1.awk | 2 +-
27 src/mkerrcodes2.awk | 2 +-
28 src/mkerrnos.awk | 2 +-
29 src/mkstrtable.awk | 10 +++++-----
30 7 files changed, 11 insertions(+), 11 deletions(-)
31
32--- a/lang/cl/mkerrcodes.awk
33+++ b/lang/cl/mkerrcodes.awk
34@@ -122,7 +122,7 @@ header {
35 }
36
37 !header {
38- sub (/\#.+/, "");
39+ sub (/#.+/, "");
40 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
41
42 if (/^$/)
43--- a/src/Makefile.am
44+++ b/src/Makefile.am
45@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
46
47 errnos-sym.h: Makefile mkstrtable.awk errnos.in
48 $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
49- -v prefix=GPG_ERR_ -v namespace=errnos_ \
50+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
51 $(srcdir)/errnos.in >$@
52
53
54--- a/src/mkerrcodes.awk
55+++ b/src/mkerrcodes.awk
56@@ -85,7 +85,7 @@ header {
57 }
58
59 !header {
60- sub (/\#.+/, "");
61+ sub (/#.+/, "");
62 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
63
64 if (/^$/)
65--- a/src/mkerrcodes1.awk
66+++ b/src/mkerrcodes1.awk
67@@ -81,7 +81,7 @@ header {
68 }
69
70 !header {
71- sub (/\#.+/, "");
72+ sub (/#.+/, "");
73 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
74
75 if (/^$/)
76--- a/src/mkerrcodes2.awk
77+++ b/src/mkerrcodes2.awk
78@@ -91,7 +91,7 @@ header {
79 }
80
81 !header {
82- sub (/\#.+/, "");
83+ sub (/#.+/, "");
84 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
85
86 if (/^$/)
87--- a/src/mkerrnos.awk
88+++ b/src/mkerrnos.awk
89@@ -83,7 +83,7 @@ header {
90 }
91
92 !header {
93- sub (/\#.+/, "");
94+ sub (/#.+/, "");
95 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
96
97 if (/^$/)
98--- a/src/mkstrtable.awk
99+++ b/src/mkstrtable.awk
100@@ -77,7 +77,7 @@
101 #
102 # The variable prefix can be used to prepend a string to each message.
103 #
104-# The variable namespace can be used to prepend a string to each
105+# The variable pkg_namespace can be used to prepend a string to each
106 # variable and macro name.
107
108 BEGIN {
109@@ -102,7 +102,7 @@ header {
110 print "/* The purpose of this complex string table is to produce";
111 print " optimal code with a minimum of relocations. */";
112 print "";
113- print "static const char " namespace "msgstr[] = ";
114+ print "static const char " pkg_namespace "msgstr[] = ";
115 header = 0;
116 }
117 else
118@@ -110,7 +110,7 @@ header {
119 }
120
121 !header {
122- sub (/\#.+/, "");
123+ sub (/#.+/, "");
124 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
125
126 if (/^$/)
127@@ -150,7 +150,7 @@ END {
128 else
129 print " gettext_noop (\"" last_msgstr "\");";
130 print "";
131- print "static const int " namespace "msgidx[] =";
132+ print "static const int " pkg_namespace "msgidx[] =";
133 print " {";
134 for (i = 0; i < coded_msgs; i++)
135 print " " pos[i] ",";
136@@ -158,7 +158,7 @@ END {
137 print " };";
138 print "";
139 print "static GPG_ERR_INLINE int";
140- print namespace "msgidxof (int code)";
141+ print pkg_namespace "msgidxof (int code)";
142 print "{";
143 print " return (0 ? 0";
144
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab0548d..b9a2b01c20 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,11 @@ SECTION = "libs"
14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 14UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ 15SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
16 file://pkgconfig.patch \ 16 file://pkgconfig.patch \
17 file://libgpg-error-1.36-gawk5-support.patch \ 17 file://0001-Do-not-fail-when-testing-config-scripts.patch \
18 " 18 "
19 19
20SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed" 20SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
21SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" 21SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
22 22
23BINCONFIG = "${bindir}/gpg-error-config" 23BINCONFIG = "${bindir}/gpg-error-config"
24 24