| Message ID | 20190831142252.7204-1-raj.khem@gmail.com |
|---|---|
| State | Accepted |
| Commit | 11f4bf5ace2e6c0baf0eebbab128d4867139249d |
| Headers | show |
| Series | libgpg-error: Fix build with gawk 5.x | expand |
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 > -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
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 > <div><br></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Sep 5, 2019 at 10:51 PM Sean Nyekjaer <<a href="mailto:sean@geanix.com">sean@geanix.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br> <br> On 04/09/2019 01.50, Khem Raj wrote:<br> > Can we cherry-pick this patch to warrior and thud, please ?<br> <br> Hi<br> <br> For thud that uses a older version af libgpg-error, and the patch <br> doesn't apply :-)<br> Should I update the patch for thud and resend?<br> </blockquote><div dir="auto"><br></div><div dir="auto">That will be helpful please do </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br> /Sean<br> </blockquote></div></div> -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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"
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 -- 2.23.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core