package/libgpg-error: fix build with gawk 5.0
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/
--- package/libgpg-error/0001-gawk5-support.patch | 162 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 2 + 2 files changed, 164 insertions(+) create mode 100644 package/libgpg-error/0001-gawk5-support.patch
package/libgpg-error/0001-gawk5-support.patch new file +162 -0
@@ -0,0 +1,162 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +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. + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch + +Signed-off-by: Bernd Kuhls <[email protected]> +-- + +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 <[email protected]> +--- + 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 ce1b882..f2590cb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) 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.21.0 +
package/libgpg-error/libgpg-error.mk +2 -0
@@ -10,6 +10,8 @@ LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB LIBGPG_ERROR_INSTALL_STAGING = YES +# 0001-gawk5-support.patch +LIBGPG_ERROR_AUTORECONF = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LIBGPG_ERROR_CONF_OPTS = --disable-tests \
Signature · 1 line
2.20.1
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
Am Sun, 01 Sep 2019 12:07:33 +0200 schrieb Bernd Kuhls:
Quoted 2 lines
e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/
Hi,
this patch assums that the build machine received an update for gawk in the last 24 hours:
http://autobuild.buildroot.net/?reason=libgpg-error-1.36
Regards, Bernd
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
In reply to Bernd KuhlsQuoted 20 lines · Bernd Kuhls
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/Signed-off-by Bernd Kuhls <[email protected]>--- package/libgpg-error/0001-gawk5-support.patch | 162 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 2 + 2 files changed, 164 insertions(+) create mode 100644 package/libgpg-error/0001-gawk5-support.patchpackage/libgpg-error/0001-gawk5-support.patch new file +4
-0@@ -0,0 +1,162 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0.
package/libgpg-error/0001-gawk5-support.patch line 14
Quoted 10 lines
package/libgpg-error/0001-gawk5-support.patch new file +10
-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. + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch + +Signed-off-by: Bernd Kuhls <[email protected]>
Fixes the build on my Arch Linux system after host version of gawk bumped to 5.0.1.
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
In reply to Bernd KuhlsQuoted 20 lines · Bernd Kuhls
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/Signed-off-by Bernd Kuhls <[email protected]>--- package/libgpg-error/0001-gawk5-support.patch | 162 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 2 + 2 files changed, 164 insertions(+) create mode 100644 package/libgpg-error/0001-gawk5-support.patchpackage/libgpg-error/0001-gawk5-support.patch new file +4
-0@@ -0,0 +1,162 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0.
package/libgpg-error/0001-gawk5-support.patch line 14
Quoted 10 lines
package/libgpg-error/0001-gawk5-support.patch new file +10
-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. + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch + +Signed-off-by: Bernd Kuhls <[email protected]>
Fixes the build on my Arch Linux system after host version of gawk bumped to 5.0.1.
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
In reply to Bernd KuhlsQuoted 20 lines · Bernd Kuhls
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/Signed-off-by Bernd Kuhls <[email protected]>--- package/libgpg-error/0001-gawk5-support.patch | 162 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 2 + 2 files changed, 164 insertions(+) create mode 100644 package/libgpg-error/0001-gawk5-support.patchpackage/libgpg-error/0001-gawk5-support.patch new file +4
-0@@ -0,0 +1,162 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0.
package/libgpg-error/0001-gawk5-support.patch line 14
Quoted 10 lines
package/libgpg-error/0001-gawk5-support.patch new file +10
-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. + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch + +Signed-off-by: Bernd Kuhls <[email protected]>
Fixes the build on my Arch Linux system after host version of gawk bumped to 5.0.1.
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
Hi,
Quoted 35 lines · J?rg Krause
Quoted 20 lines · Bernd Kuhls
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/Signed-off-by Bernd Kuhls <[email protected]>--- package/libgpg-error/0001-gawk5-support.patch | 162 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 2 + 2 files changed, 164 insertions(+) create mode 100644 package/libgpg-error/0001-gawk5-support.patchpackage/libgpg-error/0001-gawk5-support.patch new file +4
-0@@ -0,0 +1,162 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <[email protected]> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0.package/libgpg-error/0001-gawk5-support.patch line 14
Quoted 10 lines
package/libgpg-error/0001-gawk5-support.patch new file +10
-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. + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch + +Signed-off-by: Bernd Kuhls <[email protected]>Fixes the build on my Arch Linux system after host version of gawk bumped to 5.0.1.
Quoted 6 lines
Tested-by J?rg Krause <[email protected]>_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
sorry, my mail client went crazy :-(
Thomas Petazzoni
AppliedPATCH 1/1 package/libgpg-error: fix build with gawk 5.0
In reply to Bernd KuhlsQuoted 9 lines · On Sun, 1 Sep 2019 12:07:33 +0200 Bernd Kuhls <[email protected]> wrote:
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/Signed-off-by Bernd Kuhls <[email protected]>--- package/libgpg-error/0001-gawk5-support.patch | 162 ++++++++++++++++++ package/libgpg-error/libgpg-error.mk | 2 + 2 files changed, 164 insertions(+) create mode 100644 package/libgpg-error/0001-gawk5-support.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libgpg-error: fix build with gawk 5.0
In reply to Bernd KuhlsQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Fixes:
http://autobuild.buildroot.net/results/e81/e815bed0e7b3d9cbf50ebf605666a50e7032e5a1/Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2019.02.x, 2019.05.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard