summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch161
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.35.bb1
2 files changed, 162 insertions, 0 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
new file mode 100644
index 0000000000..dc3d558e24
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
@@ -0,0 +1,161 @@
1Upstream-Status: Backport [https://dev.gnupg.org/T4459]
2Signed-off-by: Sean Nyekjaer <sean@geanix.com>
3
4From 37069826e497d6af01e3e48fe5d2220ae7f85449 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
32diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
33index ae29043..9a1fc18 100644
34--- a/lang/cl/mkerrcodes.awk
35+++ b/lang/cl/mkerrcodes.awk
36@@ -122,7 +122,7 @@ header {
37 }
38
39 !header {
40- sub (/\#.+/, "");
41+ sub (/#.+/, "");
42 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
43
44 if (/^$/)
45diff --git a/src/Makefile.am b/src/Makefile.am
46index 42998e4..0ceac9f 100644
47--- a/src/Makefile.am
48+++ b/src/Makefile.am
49@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
50
51 errnos-sym.h: Makefile mkstrtable.awk errnos.in
52 $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
53- -v prefix=GPG_ERR_ -v namespace=errnos_ \
54+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
55 $(srcdir)/errnos.in >$@
56
57
58diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
59index 46d436c..e9c857c 100644
60--- a/src/mkerrcodes.awk
61+++ b/src/mkerrcodes.awk
62@@ -85,7 +85,7 @@ header {
63 }
64
65 !header {
66- sub (/\#.+/, "");
67+ sub (/#.+/, "");
68 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
69
70 if (/^$/)
71diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
72index a771a73..4578e29 100644
73--- a/src/mkerrcodes1.awk
74+++ b/src/mkerrcodes1.awk
75@@ -81,7 +81,7 @@ header {
76 }
77
78 !header {
79- sub (/\#.+/, "");
80+ sub (/#.+/, "");
81 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
82
83 if (/^$/)
84diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
85index ea58503..188f7a4 100644
86--- a/src/mkerrcodes2.awk
87+++ b/src/mkerrcodes2.awk
88@@ -91,7 +91,7 @@ header {
89 }
90
91 !header {
92- sub (/\#.+/, "");
93+ sub (/#.+/, "");
94 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
95
96 if (/^$/)
97diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
98index f79df66..15b1aad 100644
99--- a/src/mkerrnos.awk
100+++ b/src/mkerrnos.awk
101@@ -83,7 +83,7 @@ header {
102 }
103
104 !header {
105- sub (/\#.+/, "");
106+ sub (/#.+/, "");
107 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
108
109 if (/^$/)
110diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
111index c9de9c1..285e45f 100644
112--- a/src/mkstrtable.awk
113+++ b/src/mkstrtable.awk
114@@ -77,7 +77,7 @@
115 #
116 # The variable prefix can be used to prepend a string to each message.
117 #
118-# The variable namespace can be used to prepend a string to each
119+# The variable pkg_namespace can be used to prepend a string to each
120 # variable and macro name.
121
122 BEGIN {
123@@ -102,7 +102,7 @@ header {
124 print "/* The purpose of this complex string table is to produce";
125 print " optimal code with a minimum of relocations. */";
126 print "";
127- print "static const char " namespace "msgstr[] = ";
128+ print "static const char " pkg_namespace "msgstr[] = ";
129 header = 0;
130 }
131 else
132@@ -110,7 +110,7 @@ header {
133 }
134
135 !header {
136- sub (/\#.+/, "");
137+ sub (/#.+/, "");
138 sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
139
140 if (/^$/)
141@@ -150,7 +150,7 @@ END {
142 else
143 print " gettext_noop (\"" last_msgstr "\");";
144 print "";
145- print "static const int " namespace "msgidx[] =";
146+ print "static const int " pkg_namespace "msgidx[] =";
147 print " {";
148 for (i = 0; i < coded_msgs; i++)
149 print " " pos[i] ",";
150@@ -158,7 +158,7 @@ END {
151 print " };";
152 print "";
153 print "static GPG_ERR_INLINE int";
154- print namespace "msgidxof (int code)";
155+ print pkg_namespace "msgidxof (int code)";
156 print "{";
157 print " return (0 ? 0";
158
159--
1602.23.0
161
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.35.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.35.bb
index 57ac143fd5..37c298e151 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.35.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.35.bb
@@ -14,6 +14,7 @@ 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.35-gawk5-support.patch \
17 " 18 "
18 19
19SRC_URI[md5sum] = "2808a9e044f883f7554c5ba6a380b711" 20SRC_URI[md5sum] = "2808a9e044f883f7554c5ba6a380b711"