From b2f0cc8a4bfda660b343871ee0a530ed82c24aad Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 16 Oct 2021 11:40:43 +0000 Subject: [PATCH] OPENPANDORA: Prepare gnutls for newer awk --- .../openpandora/packages/gnutls/build.sh | 4 +- .../patches-libgpg-error/awk-fixes.patch | 215 ++++++++++++++++++ 2 files changed, 217 insertions(+), 2 deletions(-) create mode 100644 toolchains/openpandora/packages/gnutls/patches-libgpg-error/awk-fixes.patch diff --git a/toolchains/openpandora/packages/gnutls/build.sh b/toolchains/openpandora/packages/gnutls/build.sh index a5a985e..ee5a359 100755 --- a/toolchains/openpandora/packages/gnutls/build.sh +++ b/toolchains/openpandora/packages/gnutls/build.sh @@ -23,9 +23,9 @@ do_make_bdir do_http_fetch libgpg-error "http://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${LIBGPG_ERROR_VERSION}.tar.bz2" \ 'tar xjf' "sha256:${LIBGPG_ERROR_SHA256}" +do_patch libgpg-error -# Fix GCC preprocessor without a patch to avoid hacks -sed -ie 's/_\$@ | grep GPG_ERR_ |/-P \0/' src/Makefile.in +autoreconf -fi -I m4 # Enable shared objects to make binary lighter do_configure_shared diff --git a/toolchains/openpandora/packages/gnutls/patches-libgpg-error/awk-fixes.patch b/toolchains/openpandora/packages/gnutls/patches-libgpg-error/awk-fixes.patch new file mode 100644 index 0000000..29b32a4 --- /dev/null +++ b/toolchains/openpandora/packages/gnutls/patches-libgpg-error/awk-fixes.patch @@ -0,0 +1,215 @@ +From 1b5fb3e6ac5a850ee0da0da695c74ff833b56679 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH 1/2] 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 +--- + 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/mkheader.awk | 6 +++--- + src/mkstrtable.awk | 10 +++++----- + 8 files changed, 14 insertions(+), 14 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 dd77b89..3c8da27 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -134,7 +134,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 >$@ + + gpg-error.h: Makefile mkheader.awk \ +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 3e92636..c723f3e 100644 +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -78,7 +78,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 c4bbf81..7b692fb 100644 +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -80,7 +80,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkheader.awk b/src/mkheader.awk +index 67de05d..abde774 100644 +--- a/src/mkheader.awk ++++ b/src/mkheader.awk +@@ -82,7 +82,7 @@ sources_header { + } + + sources_body { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -111,7 +111,7 @@ between_sources_and_codes { + } + + codes_body { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -140,7 +140,7 @@ between_codes_and_errnos { + } + + errnos_body { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk +index 31eb121..b27749b 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,14 +150,14 @@ END { + else + print " gettext_noop (\"" prefix 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] ","; + print " " pos[coded_msgs]; + print " };"; + print ""; +- print "#define " namespace "msgidxof(code) (0 ? -1 \\"; ++ print "#define " pkg_namespace "msgidxof(code) (0 ? -1 \\"; + + # Gather the ranges. + skip = code[0]; +-- +2.32.0 + + +From 164288e40063ab4833558c40d44cde109cf8f12e Mon Sep 17 00:00:00 2001 +From: Le Philousophe +Date: Sun, 10 Oct 2021 20:26:16 +0200 +Subject: [PATCH 2/2] Fix preprocessor output + +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 3c8da27..39f9a99 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -121,7 +121,7 @@ code-to-errno.h: Makefile mkerrnos.awk errnos.in + # It is correct to use $(CPP). We want the host's idea of the error codes. + mkerrcodes.h: Makefile mkerrcodes.awk + $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@ +- $(CPP) _$@ | grep GPG_ERR_ | $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ ++ $(CPP) -P _$@ | grep GPG_ERR_ | $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + -rm _$@ + + # It is correct to use $(CC_FOR_BUILD) here. We want to run the +-- +2.32.0 +