* [PATCH] libgpg-error: Fix build with gawk 5.x
@ 2019-08-31 14:22 Khem Raj
2019-09-03 23:50 ` Khem Raj
0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2019-08-31 14:22 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libgpg-error-1.36-gawk5-support.patch | 142 ++++++++++++++++++
.../libgpg-error/libgpg-error_1.36.bb | 1 +
2 files changed, 143 insertions(+)
create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
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
new file mode 100644
index 0000000000..2db11b2176
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
@@ -0,0 +1,142 @@
+From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+---
+ lang/cl/mkerrcodes.awk | 2 +-
+ src/Makefile.am | 2 +-
+ src/mkerrcodes.awk | 2 +-
+ src/mkerrcodes1.awk | 2 +-
+ src/mkerrcodes2.awk | 2 +-
+ src/mkerrnos.awk | 2 +-
+ src/mkstrtable.awk | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+ print "/* The purpose of this complex string table is to produce";
+ print " optimal code with a minimum of relocations. */";
+ print "";
+- print "static const char " namespace "msgstr[] = ";
++ print "static const char " pkg_namespace "msgstr[] = ";
+ header = 0;
+ }
+ else
+@@ -110,7 +110,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+@@ -150,7 +150,7 @@ END {
+ else
+ print " gettext_noop (\"" last_msgstr "\");";
+ print "";
+- print "static const int " namespace "msgidx[] =";
++ print "static const int " pkg_namespace "msgidx[] =";
+ print " {";
+ for (i = 0; i < coded_msgs; i++)
+ print " " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+ print " };";
+ print "";
+ print "static GPG_ERR_INLINE int";
+- print namespace "msgidxof (int code)";
++ print pkg_namespace "msgidxof (int code)";
+ print "{";
+ print " return (0 ? 0";
+
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
index 2db544a12e..b11ab0548d 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
@@ -14,6 +14,7 @@ SECTION = "libs"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
+ file://libgpg-error-1.36-gawk5-support.patch \
"
SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] libgpg-error: Fix build with gawk 5.x
2019-08-31 14:22 [PATCH] libgpg-error: Fix build with gawk 5.x Khem Raj
@ 2019-09-03 23:50 ` Khem Raj
2019-09-06 5:50 ` Sean Nyekjaer
0 siblings, 1 reply; 11+ messages in thread
From: Khem Raj @ 2019-09-03 23:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer, Armin Kuster
Hi Armin
Can we cherry-pick this patch to warrior and thud, please ?
On Sat, Aug 31, 2019 at 7:23 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../libgpg-error-1.36-gawk5-support.patch | 142 ++++++++++++++++++
> .../libgpg-error/libgpg-error_1.36.bb | 1 +
> 2 files changed, 143 insertions(+)
> create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
>
> 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
> new file mode 100644
> index 0000000000..2db11b2176
> --- /dev/null
> +++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> @@ -0,0 +1,142 @@
> +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
> +From: NIIBE Yutaka <gniibe@fsij.org>
> +Date: Mon, 15 Apr 2019 15:10:44 +0900
> +Subject: [PATCH] awk: Prepare for Gawk 5.0.
> +
> +* src/Makefile.am: Use pkg_namespace (instead of namespace).
> +* src/mkerrnos.awk: Likewise.
> +* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
> +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
> +
> +--
> +
> +In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
> +which only allows escaping specific characters.
> +
> +GnuPG-bug-id: 4459
> +Reported-by: Marius Schamschula
> +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
> +Upstream-Status: Backport [https://dev.gnupg.org/T4459]
> +---
> + lang/cl/mkerrcodes.awk | 2 +-
> + src/Makefile.am | 2 +-
> + src/mkerrcodes.awk | 2 +-
> + src/mkerrcodes1.awk | 2 +-
> + src/mkerrcodes2.awk | 2 +-
> + src/mkerrnos.awk | 2 +-
> + src/mkstrtable.awk | 10 +++++-----
> + 7 files changed, 11 insertions(+), 11 deletions(-)
> +
> +--- a/lang/cl/mkerrcodes.awk
> ++++ b/lang/cl/mkerrcodes.awk
> +@@ -122,7 +122,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
> +
> + errnos-sym.h: Makefile mkstrtable.awk errnos.in
> + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
> +- -v prefix=GPG_ERR_ -v namespace=errnos_ \
> ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
> + $(srcdir)/errnos.in >$@
> +
> +
> +--- a/src/mkerrcodes.awk
> ++++ b/src/mkerrcodes.awk
> +@@ -85,7 +85,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +--- a/src/mkerrcodes1.awk
> ++++ b/src/mkerrcodes1.awk
> +@@ -81,7 +81,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +--- a/src/mkerrcodes2.awk
> ++++ b/src/mkerrcodes2.awk
> +@@ -91,7 +91,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +--- a/src/mkerrnos.awk
> ++++ b/src/mkerrnos.awk
> +@@ -83,7 +83,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +--- a/src/mkstrtable.awk
> ++++ b/src/mkstrtable.awk
> +@@ -77,7 +77,7 @@
> + #
> + # The variable prefix can be used to prepend a string to each message.
> + #
> +-# The variable namespace can be used to prepend a string to each
> ++# The variable pkg_namespace can be used to prepend a string to each
> + # variable and macro name.
> +
> + BEGIN {
> +@@ -102,7 +102,7 @@ header {
> + print "/* The purpose of this complex string table is to produce";
> + print " optimal code with a minimum of relocations. */";
> + print "";
> +- print "static const char " namespace "msgstr[] = ";
> ++ print "static const char " pkg_namespace "msgstr[] = ";
> + header = 0;
> + }
> + else
> +@@ -110,7 +110,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +@@ -150,7 +150,7 @@ END {
> + else
> + print " gettext_noop (\"" last_msgstr "\");";
> + print "";
> +- print "static const int " namespace "msgidx[] =";
> ++ print "static const int " pkg_namespace "msgidx[] =";
> + print " {";
> + for (i = 0; i < coded_msgs; i++)
> + print " " pos[i] ",";
> +@@ -158,7 +158,7 @@ END {
> + print " };";
> + print "";
> + print "static GPG_ERR_INLINE int";
> +- print namespace "msgidxof (int code)";
> ++ print pkg_namespace "msgidxof (int code)";
> + print "{";
> + print " return (0 ? 0";
> +
> diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> index 2db544a12e..b11ab0548d 100644
> --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> @@ -14,6 +14,7 @@ SECTION = "libs"
> UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
> SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
> file://pkgconfig.patch \
> + file://libgpg-error-1.36-gawk5-support.patch \
> "
>
> SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
> --
> 2.23.0
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] libgpg-error: Fix build with gawk 5.x
2019-09-03 23:50 ` Khem Raj
@ 2019-09-06 5:50 ` Sean Nyekjaer
2019-09-06 14:12 ` Khem Raj
0 siblings, 1 reply; 11+ messages in thread
From: Sean Nyekjaer @ 2019-09-06 5:50 UTC (permalink / raw)
To: Khem Raj, Patches and discussions about the oe-core layer, Armin Kuster
On 04/09/2019 01.50, Khem Raj wrote:
> Can we cherry-pick this patch to warrior and thud, please ?
Hi
For thud that uses a older version af libgpg-error, and the patch
doesn't apply :-)
Should I update the patch for thud and resend?
/Sean
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] libgpg-error: Fix build with gawk 5.x
2019-09-06 5:50 ` Sean Nyekjaer
@ 2019-09-06 14:12 ` Khem Raj
2019-09-08 17:31 ` [thud][PATCH] " Sean Nyekjaer
2019-09-08 17:31 ` [warrior][PATCH] " Sean Nyekjaer
0 siblings, 2 replies; 11+ messages in thread
From: Khem Raj @ 2019-09-06 14:12 UTC (permalink / raw)
To: Sean Nyekjaer; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
On Thu, Sep 5, 2019 at 10:51 PM Sean Nyekjaer <sean@geanix.com> wrote:
>
>
> On 04/09/2019 01.50, Khem Raj wrote:
> > Can we cherry-pick this patch to warrior and thud, please ?
>
> Hi
>
> For thud that uses a older version af libgpg-error, and the patch
> doesn't apply :-)
> Should I update the patch for thud and resend?
>
That will be helpful please do
>
> /Sean
>
[-- Attachment #2: Type: text/html, Size: 842 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [thud][PATCH] libgpg-error: Fix build with gawk 5.x
2019-09-06 14:12 ` Khem Raj
@ 2019-09-08 17:31 ` Sean Nyekjaer
2019-09-08 17:31 ` [warrior][PATCH] " Sean Nyekjaer
1 sibling, 0 replies; 11+ messages in thread
From: Sean Nyekjaer @ 2019-09-08 17:31 UTC (permalink / raw)
To: openembedded-core, akuster808
Based on poky master, but for version 1.32
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
---
.../libgpg-error-1.32-gawk5-support.patch | 160 ++++++++++++++++++
.../libgpg-error/libgpg-error_1.32.bb | 1 +
2 files changed, 161 insertions(+)
create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
new file mode 100644
index 0000000000..bbb38a60ca
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
@@ -0,0 +1,160 @@
+From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+(cherry picked from commit 7865041c77f4f7005282f10f9b6666b19072fbdf)
+---
+ lang/cl/mkerrcodes.awk | 2 +-
+ src/Makefile.am | 2 +-
+ src/mkerrcodes.awk | 2 +-
+ src/mkerrcodes1.awk | 2 +-
+ src/mkerrcodes2.awk | 2 +-
+ src/mkerrnos.awk | 2 +-
+ src/mkstrtable.awk | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 42998e4..0ceac9f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+ print "/* The purpose of this complex string table is to produce";
+ print " optimal code with a minimum of relocations. */";
+ print "";
+- print "static const char " namespace "msgstr[] = ";
++ print "static const char " pkg_namespace "msgstr[] = ";
+ header = 0;
+ }
+ else
+@@ -110,7 +110,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+@@ -150,7 +150,7 @@ END {
+ else
+ print " gettext_noop (\"" last_msgstr "\");";
+ print "";
+- print "static const int " namespace "msgidx[] =";
++ print "static const int " pkg_namespace "msgidx[] =";
+ print " {";
+ for (i = 0; i < coded_msgs; i++)
+ print " " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+ print " };";
+ print "";
+ print "static GPG_ERR_INLINE int";
+- print namespace "msgidxof (int code)";
++ print pkg_namespace "msgidxof (int code)";
+ print "{";
+ print " return (0 ? 0";
+
+--
+2.23.0
+
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
index e552001cb6..aae5c7c844 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
@@ -16,6 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
file://0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \
file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \
+ file://libgpg-error-1.32-gawk5-support.patch \
"
SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64"
SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca"
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [warrior][PATCH] libgpg-error: Fix build with gawk 5.x
2019-09-06 14:12 ` Khem Raj
2019-09-08 17:31 ` [thud][PATCH] " Sean Nyekjaer
@ 2019-09-08 17:31 ` Sean Nyekjaer
2019-09-09 18:09 ` akuster808
1 sibling, 1 reply; 11+ messages in thread
From: Sean Nyekjaer @ 2019-09-08 17:31 UTC (permalink / raw)
To: openembedded-core, akuster808
Based on poky master, but for version 1.35
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
---
.../libgpg-error-1.35-gawk5-support.patch | 160 ++++++++++++++++++
.../libgpg-error/libgpg-error_1.35.bb | 1 +
2 files changed, 161 insertions(+)
create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
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..bbb38a60ca
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
@@ -0,0 +1,160 @@
+From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+(cherry picked from commit 7865041c77f4f7005282f10f9b6666b19072fbdf)
+---
+ lang/cl/mkerrcodes.awk | 2 +-
+ src/Makefile.am | 2 +-
+ src/mkerrcodes.awk | 2 +-
+ src/mkerrcodes1.awk | 2 +-
+ src/mkerrcodes2.awk | 2 +-
+ src/mkerrnos.awk | 2 +-
+ src/mkstrtable.awk | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 42998e4..0ceac9f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+ print "/* The purpose of this complex string table is to produce";
+ print " optimal code with a minimum of relocations. */";
+ print "";
+- print "static const char " namespace "msgstr[] = ";
++ print "static const char " pkg_namespace "msgstr[] = ";
+ header = 0;
+ }
+ else
+@@ -110,7 +110,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+@@ -150,7 +150,7 @@ END {
+ else
+ print " gettext_noop (\"" last_msgstr "\");";
+ print "";
+- print "static const int " namespace "msgidx[] =";
++ print "static const int " pkg_namespace "msgidx[] =";
+ print " {";
+ for (i = 0; i < coded_msgs; i++)
+ print " " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+ print " };";
+ print "";
+ print "static GPG_ERR_INLINE int";
+- print namespace "msgidxof (int code)";
++ print pkg_namespace "msgidxof (int code)";
+ print "{";
+ print " return (0 ? 0";
+
+--
+2.23.0
+
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"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
+ file://libgpg-error-1.35-gawk5-support.patch \
"
SRC_URI[md5sum] = "2808a9e044f883f7554c5ba6a380b711"
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [warrior][PATCH] libgpg-error: Fix build with gawk 5.x
2019-09-08 17:31 ` [warrior][PATCH] " Sean Nyekjaer
@ 2019-09-09 18:09 ` akuster808
2019-09-09 18:29 ` [thud][PATCH v2] " Sean Nyekjaer
2019-09-09 18:29 ` [warrior][PATCH " Sean Nyekjaer
0 siblings, 2 replies; 11+ messages in thread
From: akuster808 @ 2019-09-09 18:09 UTC (permalink / raw)
To: Sean Nyekjaer, openembedded-core
On 9/8/19 10:31 AM, Sean Nyekjaer wrote:
> Based on poky master, but for version 1.35
thanks.
can you include the patch fixup in master too?
https://git.openembedded.org/openembedded-core/commit/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch?id=1418581aa22f37c5d7d9a686c1c387149954e9b2
- armin
> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
> ---
> .../libgpg-error-1.35-gawk5-support.patch | 160 ++++++++++++++++++
> .../libgpg-error/libgpg-error_1.35.bb | 1 +
> 2 files changed, 161 insertions(+)
> create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
>
> 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..bbb38a60ca
> --- /dev/null
> +++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
> @@ -0,0 +1,160 @@
> +From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
> +From: NIIBE Yutaka <gniibe@fsij.org>
> +Date: Mon, 15 Apr 2019 15:10:44 +0900
> +Subject: [PATCH] awk: Prepare for Gawk 5.0.
> +
> +* src/Makefile.am: Use pkg_namespace (instead of namespace).
> +* src/mkerrnos.awk: Likewise.
> +* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
> +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
> +
> +--
> +
> +In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
> +which only allows escaping specific characters.
> +
> +GnuPG-bug-id: 4459
> +Reported-by: Marius Schamschula
> +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
> +Upstream-Status: Backport [https://dev.gnupg.org/T4459]
> +(cherry picked from commit 7865041c77f4f7005282f10f9b6666b19072fbdf)
> +---
> + lang/cl/mkerrcodes.awk | 2 +-
> + src/Makefile.am | 2 +-
> + src/mkerrcodes.awk | 2 +-
> + src/mkerrcodes1.awk | 2 +-
> + src/mkerrcodes2.awk | 2 +-
> + src/mkerrnos.awk | 2 +-
> + src/mkstrtable.awk | 10 +++++-----
> + 7 files changed, 11 insertions(+), 11 deletions(-)
> +
> +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
> +index ae29043..9a1fc18 100644
> +--- a/lang/cl/mkerrcodes.awk
> ++++ b/lang/cl/mkerrcodes.awk
> +@@ -122,7 +122,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 42998e4..0ceac9f 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
> +
> + errnos-sym.h: Makefile mkstrtable.awk errnos.in
> + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
> +- -v prefix=GPG_ERR_ -v namespace=errnos_ \
> ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
> + $(srcdir)/errnos.in >$@
> +
> +
> +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
> +index 46d436c..e9c857c 100644
> +--- a/src/mkerrcodes.awk
> ++++ b/src/mkerrcodes.awk
> +@@ -85,7 +85,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
> +index a771a73..4578e29 100644
> +--- a/src/mkerrcodes1.awk
> ++++ b/src/mkerrcodes1.awk
> +@@ -81,7 +81,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
> +index ea58503..188f7a4 100644
> +--- a/src/mkerrcodes2.awk
> ++++ b/src/mkerrcodes2.awk
> +@@ -91,7 +91,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
> +index f79df66..15b1aad 100644
> +--- a/src/mkerrnos.awk
> ++++ b/src/mkerrnos.awk
> +@@ -83,7 +83,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
> +index c9de9c1..285e45f 100644
> +--- a/src/mkstrtable.awk
> ++++ b/src/mkstrtable.awk
> +@@ -77,7 +77,7 @@
> + #
> + # The variable prefix can be used to prepend a string to each message.
> + #
> +-# The variable namespace can be used to prepend a string to each
> ++# The variable pkg_namespace can be used to prepend a string to each
> + # variable and macro name.
> +
> + BEGIN {
> +@@ -102,7 +102,7 @@ header {
> + print "/* The purpose of this complex string table is to produce";
> + print " optimal code with a minimum of relocations. */";
> + print "";
> +- print "static const char " namespace "msgstr[] = ";
> ++ print "static const char " pkg_namespace "msgstr[] = ";
> + header = 0;
> + }
> + else
> +@@ -110,7 +110,7 @@ header {
> + }
> +
> + !header {
> +- sub (/\#.+/, "");
> ++ sub (/#.+/, "");
> + sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
> +
> + if (/^$/)
> +@@ -150,7 +150,7 @@ END {
> + else
> + print " gettext_noop (\"" last_msgstr "\");";
> + print "";
> +- print "static const int " namespace "msgidx[] =";
> ++ print "static const int " pkg_namespace "msgidx[] =";
> + print " {";
> + for (i = 0; i < coded_msgs; i++)
> + print " " pos[i] ",";
> +@@ -158,7 +158,7 @@ END {
> + print " };";
> + print "";
> + print "static GPG_ERR_INLINE int";
> +- print namespace "msgidxof (int code)";
> ++ print pkg_namespace "msgidxof (int code)";
> + print "{";
> + print " return (0 ? 0";
> +
> +--
> +2.23.0
> +
> 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"
> UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
> SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
> file://pkgconfig.patch \
> + file://libgpg-error-1.35-gawk5-support.patch \
> "
>
> SRC_URI[md5sum] = "2808a9e044f883f7554c5ba6a380b711"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [thud][PATCH v2] libgpg-error: Fix build with gawk 5.x
2019-09-09 18:09 ` akuster808
@ 2019-09-09 18:29 ` Sean Nyekjaer
2019-09-19 13:41 ` Sean Nyekjaer
2019-09-09 18:29 ` [warrior][PATCH " Sean Nyekjaer
1 sibling, 1 reply; 11+ messages in thread
From: Sean Nyekjaer @ 2019-09-09 18:29 UTC (permalink / raw)
To: openembedded-core, akuster808
Based on poky master, but for version 1.32
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
---
.../libgpg-error-1.32-gawk5-support.patch | 161 ++++++++++++++++++
.../libgpg-error/libgpg-error_1.32.bb | 1 +
2 files changed, 162 insertions(+)
create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
new file mode 100644
index 0000000000..dc3d558e24
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
@@ -0,0 +1,161 @@
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+Signed-off-by: Sean Nyekjaer <sean@geanix.com>
+
+From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ lang/cl/mkerrcodes.awk | 2 +-
+ src/Makefile.am | 2 +-
+ src/mkerrcodes.awk | 2 +-
+ src/mkerrcodes1.awk | 2 +-
+ src/mkerrcodes2.awk | 2 +-
+ src/mkerrnos.awk | 2 +-
+ src/mkstrtable.awk | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 42998e4..0ceac9f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+ print "/* The purpose of this complex string table is to produce";
+ print " optimal code with a minimum of relocations. */";
+ print "";
+- print "static const char " namespace "msgstr[] = ";
++ print "static const char " pkg_namespace "msgstr[] = ";
+ header = 0;
+ }
+ else
+@@ -110,7 +110,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+@@ -150,7 +150,7 @@ END {
+ else
+ print " gettext_noop (\"" last_msgstr "\");";
+ print "";
+- print "static const int " namespace "msgidx[] =";
++ print "static const int " pkg_namespace "msgidx[] =";
+ print " {";
+ for (i = 0; i < coded_msgs; i++)
+ print " " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+ print " };";
+ print "";
+ print "static GPG_ERR_INLINE int";
+- print namespace "msgidxof (int code)";
++ print pkg_namespace "msgidxof (int code)";
+ print "{";
+ print " return (0 ? 0";
+
+--
+2.23.0
+
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
index e552001cb6..aae5c7c844 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.32.bb
@@ -16,6 +16,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
file://0001-syscfg-Support-ARC-CPUs-and-simplify-aliasing-table.patch \
file://0002-syscfg-Add-support-for-arc-unknown-linux-gnu.patch \
+ file://libgpg-error-1.32-gawk5-support.patch \
"
SRC_URI[md5sum] = "ef3d928a5a453fa701ecc3bb22be1c64"
SRC_URI[sha256sum] = "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca"
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [warrior][PATCH v2] libgpg-error: Fix build with gawk 5.x
2019-09-09 18:09 ` akuster808
2019-09-09 18:29 ` [thud][PATCH v2] " Sean Nyekjaer
@ 2019-09-09 18:29 ` Sean Nyekjaer
1 sibling, 0 replies; 11+ messages in thread
From: Sean Nyekjaer @ 2019-09-09 18:29 UTC (permalink / raw)
To: openembedded-core, akuster808
Based on poky master, but for version 1.35
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
---
.../libgpg-error-1.35-gawk5-support.patch | 161 ++++++++++++++++++
.../libgpg-error/libgpg-error_1.35.bb | 1 +
2 files changed, 162 insertions(+)
create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.35-gawk5-support.patch
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 @@
+Upstream-Status: Backport [https://dev.gnupg.org/T4459]
+Signed-off-by: Sean Nyekjaer <sean@geanix.com>
+
+From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ lang/cl/mkerrcodes.awk | 2 +-
+ src/Makefile.am | 2 +-
+ src/mkerrcodes.awk | 2 +-
+ src/mkerrcodes1.awk | 2 +-
+ src/mkerrcodes2.awk | 2 +-
+ src/mkerrnos.awk | 2 +-
+ src/mkstrtable.awk | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 42998e4..0ceac9f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+ print "/* The purpose of this complex string table is to produce";
+ print " optimal code with a minimum of relocations. */";
+ print "";
+- print "static const char " namespace "msgstr[] = ";
++ print "static const char " pkg_namespace "msgstr[] = ";
+ header = 0;
+ }
+ else
+@@ -110,7 +110,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+@@ -150,7 +150,7 @@ END {
+ else
+ print " gettext_noop (\"" last_msgstr "\");";
+ print "";
+- print "static const int " namespace "msgidx[] =";
++ print "static const int " pkg_namespace "msgidx[] =";
+ print " {";
+ for (i = 0; i < coded_msgs; i++)
+ print " " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+ print " };";
+ print "";
+ print "static GPG_ERR_INLINE int";
+- print namespace "msgidxof (int code)";
++ print pkg_namespace "msgidxof (int code)";
+ print "{";
+ print " return (0 ? 0";
+
+--
+2.23.0
+
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"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
+ file://libgpg-error-1.35-gawk5-support.patch \
"
SRC_URI[md5sum] = "2808a9e044f883f7554c5ba6a380b711"
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [thud][PATCH v2] libgpg-error: Fix build with gawk 5.x
2019-09-09 18:29 ` [thud][PATCH v2] " Sean Nyekjaer
@ 2019-09-19 13:41 ` Sean Nyekjaer
2019-09-19 14:19 ` akuster808
0 siblings, 1 reply; 11+ messages in thread
From: Sean Nyekjaer @ 2019-09-19 13:41 UTC (permalink / raw)
To: openembedded-core, akuster808
On 09/09/2019 20.29, Sean Nyekjaer wrote:
> Based on poky master, but for version 1.32
>
> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
> ---
> .../libgpg-error-1.32-gawk5-support.patch | 161 ++++++++++++++++++
> .../libgpg-error/libgpg-error_1.32.bb | 1 +
> 2 files changed, 162 insertions(+)
> create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
>
Hi Armin
Could we merge this and the one for warrior?
Br
/Sean
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [thud][PATCH v2] libgpg-error: Fix build with gawk 5.x
2019-09-19 13:41 ` Sean Nyekjaer
@ 2019-09-19 14:19 ` akuster808
0 siblings, 0 replies; 11+ messages in thread
From: akuster808 @ 2019-09-19 14:19 UTC (permalink / raw)
To: Sean Nyekjaer, openembedded-core
On 9/19/19 6:41 AM, Sean Nyekjaer wrote:
>
>
> On 09/09/2019 20.29, Sean Nyekjaer wrote:
>> Based on poky master, but for version 1.32
>>
>> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
>> ---
>> .../libgpg-error-1.32-gawk5-support.patch | 161 ++++++++++++++++++
>> .../libgpg-error/libgpg-error_1.32.bb | 1 +
>> 2 files changed, 162 insertions(+)
>> create mode 100644
>> meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.32-gawk5-support.patch
>>
>
> Hi Armin
>
> Could we merge this and the one for warrior?
Yes. its already sitting in the stable/warrior-nmut
- armin
>
> Br
> /Sean
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-09-19 14:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-31 14:22 [PATCH] libgpg-error: Fix build with gawk 5.x Khem Raj
2019-09-03 23:50 ` Khem Raj
2019-09-06 5:50 ` Sean Nyekjaer
2019-09-06 14:12 ` Khem Raj
2019-09-08 17:31 ` [thud][PATCH] " Sean Nyekjaer
2019-09-08 17:31 ` [warrior][PATCH] " Sean Nyekjaer
2019-09-09 18:09 ` akuster808
2019-09-09 18:29 ` [thud][PATCH v2] " Sean Nyekjaer
2019-09-19 13:41 ` Sean Nyekjaer
2019-09-19 14:19 ` akuster808
2019-09-09 18:29 ` [warrior][PATCH " Sean Nyekjaer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.