From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.lab.pengutronix.de) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i4i1k-0001v0-Uu for ptxdist@pengutronix.de; Mon, 02 Sep 2019 10:49:32 +0200 Received: from mol by dude02.lab.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1i4i1k-0003tp-Mf for ptxdist@pengutronix.de; Mon, 02 Sep 2019 10:49:32 +0200 Date: Mon, 2 Sep 2019 10:49:32 +0200 From: Michael Olbrich Message-ID: <20190902084932.GC13226@pengutronix.de> References: <05ad61b4-6f38-de71-e43b-e7f558c1adb2@initse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <05ad61b4-6f38-de71-e43b-e7f558c1adb2@initse.com> Subject: Re: [ptxdist] [PATCH] libgpg-error: Fix build on hosts with gawk-5.0 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de On Fri, Aug 30, 2019 at 11:20:00AM +0000, Koch, Alexander wrote: > --- > .../0001-Fix-for-gawk-5.0.patch | 159 ++++++++++++++++++ > patches/libgpg-error-1.32/series | 1 + > 2 files changed, 160 insertions(+) > create mode 100644 patches/libgpg-error-1.32/0001-Fix-for-gawk-5.0.patch > create mode 100644 patches/libgpg-error-1.32/series > > diff --git a/patches/libgpg-error-1.32/0001-Fix-for-gawk-5.0.patch b/patches/libgpg-error-1.32/0001-Fix-for-gawk-5.0.patch > new file mode 100644 > index 000000000..3b67387dc > --- /dev/null > +++ b/patches/libgpg-error-1.32/0001-Fix-for-gawk-5.0.patch > @@ -0,0 +1,159 @@ > +From ff9ae9d6537975d556444b2a16e185170527e271 Mon Sep 17 00:00:00 2001 > +From: "Alexander Koch" > +Date: Fri, 30 Aug 2019 13:07:08 +0200 > +Subject: [PATCH] Fix for gawk-5.0 These is a upstream commit for this. Please use it. > + > +--- > + lang/cl/mkerrcodes.awk | 2 +- > + src/Makefile.am | 2 +- > + src/Makefile.in | 2 +- Don't patch Makefile.in, add a autogen.sh (probably a symlink to ../autogen.sh like many other packages) instead to regenerate it. Michael > + src/mkerrcodes.awk | 2 +- > + src/mkerrcodes1.awk | 2 +- > + src/mkerrcodes2.awk | 2 +- > + src/mkerrnos.awk | 2 +- > + src/mkstrtable.awk | 10 +++++----- > + 8 files changed, 12 insertions(+), 12 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/Makefile.in b/src/Makefile.in > +index 9ffb29d..a9efa38 100644 > +--- a/src/Makefile.in > ++++ b/src/Makefile.in > +@@ -1449,7 +1449,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 >$@ > + > + mkheader: mkheader.c Makefile > +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/patches/libgpg-error-1.32/series b/patches/libgpg-error-1.32/series > new file mode 100644 > index 000000000..93e21eb72 > --- /dev/null > +++ b/patches/libgpg-error-1.32/series > @@ -0,0 +1 @@ > +0001-Fix-for-gawk-5.0.patch > -- > 2.23.0 > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de