All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] libgpg-error: upgrade 1.36 -> 1.37
@ 2020-02-26 18:39 Trevor Gamblin
  2020-02-27 16:24 ` Trevor Gamblin
  0 siblings, 1 reply; 8+ messages in thread
From: Trevor Gamblin @ 2020-02-26 18:39 UTC (permalink / raw)
  To: openembedded-core

https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported
patch is removed.

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
 .../libgpg-error-1.36-gawk5-support.patch     | 144 ------------------
 ...gpg-error_1.36.bb => libgpg-error_1.37.bb} |   5 +-
 2 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)

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
deleted file mode 100644
index b936d1143b..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Upstream-Status: Backport [https://dev.gnupg.org/T4459]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-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>
----
- 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.37.bb
similarity index 92%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab0548d..bf1da84eb9 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,10 @@ 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"
-SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
+SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
+SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.24.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37
  2020-02-26 18:39 [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Trevor Gamblin
@ 2020-02-27 16:24 ` Trevor Gamblin
  2020-02-27 23:14   ` Richard Purdie
  0 siblings, 1 reply; 8+ messages in thread
From: Trevor Gamblin @ 2020-02-27 16:24 UTC (permalink / raw)
  To: openembedded-core

Looks like I got beat by a day!

On 2/26/20 1:39 PM, Trevor Gamblin wrote:
> https://dev.gnupg.org/T4459 was fixed in 1.37, so the backported
> patch is removed.
>
> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../libgpg-error-1.36-gawk5-support.patch     | 144 ------------------
>   ...gpg-error_1.36.bb => libgpg-error_1.37.bb} |   5 +-
>   2 files changed, 2 insertions(+), 147 deletions(-)
>   delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
>   rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)
>
> 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
> deleted file mode 100644
> index b936d1143b..0000000000
> --- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -Upstream-Status: Backport [https://dev.gnupg.org/T4459]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -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>
> ----
> - 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.37.bb
> similarity index 92%
> rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> index b11ab0548d..bf1da84eb9 100644
> --- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
> +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
> @@ -14,11 +14,10 @@ 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"
> -SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
> +SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
> +SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
>   
>   BINCONFIG = "${bindir}/gpg-error-config"
>   


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37
  2020-02-27 16:24 ` Trevor Gamblin
@ 2020-02-27 23:14   ` Richard Purdie
  2020-02-27 23:41     ` Trevor Gamblin
  0 siblings, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2020-02-27 23:14 UTC (permalink / raw)
  To: Trevor Gamblin, openembedded-core

On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote:
> Looks like I got beat by a day!

Does your version work on x32 though? :)

We need one that does...

Cheers,

Richard



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37
  2020-02-27 23:14   ` Richard Purdie
@ 2020-02-27 23:41     ` Trevor Gamblin
  2020-02-28  9:28       ` Alexander Kanavin
  0 siblings, 1 reply; 8+ messages in thread
From: Trevor Gamblin @ 2020-02-27 23:41 UTC (permalink / raw)
  To: Richard Purdie, openembedded-core


On 2/27/20 6:14 PM, Richard Purdie wrote:
> On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote:
>> Looks like I got beat by a day!
> Does your version work on x32 though? :)
>
> We need one that does...

They look the same, unfortunately.

Will take a look in between some other tasks, unless Alex gets to it 
first (he usually does, that guy's a machine).

>
> Cheers,
>
> Richard
>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37
  2020-02-27 23:41     ` Trevor Gamblin
@ 2020-02-28  9:28       ` Alexander Kanavin
  0 siblings, 0 replies; 8+ messages in thread
From: Alexander Kanavin @ 2020-02-28  9:28 UTC (permalink / raw)
  To: Trevor Gamblin; +Cc: OE-core

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

Patch sent. :)

Alex

On Fri, 28 Feb 2020 at 00:42, Trevor Gamblin <trevor.gamblin@windriver.com>
wrote:

>
> On 2/27/20 6:14 PM, Richard Purdie wrote:
> > On Thu, 2020-02-27 at 11:24 -0500, Trevor Gamblin wrote:
> >> Looks like I got beat by a day!
> > Does your version work on x32 though? :)
> >
> > We need one that does...
>
> They look the same, unfortunately.
>
> Will take a look in between some other tasks, unless Alex gets to it
> first (he usually does, that guy's a machine).
>
> >
> > Cheers,
> >
> > Richard
> >
>

[-- Attachment #2: Type: text/html, Size: 950 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] libgpg-error: upgrade 1.36 -> 1.37
@ 2020-02-28  9:25 Alexander Kanavin
  0 siblings, 0 replies; 8+ messages in thread
From: Alexander Kanavin @ 2020-02-28  9:25 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...not-fail-when-testing-config-scripts.patch |  27 ++++
 .../libgpg-error-1.36-gawk5-support.patch     | 144 ------------------
 ...gpg-error_1.36.bb => libgpg-error_1.37.bb} |   8 +-
 3 files changed, 31 insertions(+), 148 deletions(-)
 create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (91%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
new file mode 100644
index 0000000000..a0ab4f23ff
--- /dev/null
+++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-Do-not-fail-when-testing-config-scripts.patch
@@ -0,0 +1,27 @@
+From 137805890951b6b585c1d23097e0a51e8c7a8a50 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 28 Feb 2020 09:19:56 +0000
+Subject: [PATCH] Do not fail when testing config scripts
+
+In previous versions this was not a hard a failure, and so went
+unnoticed. The test is unsuitable for building with sysroots anyway as the
+failure is due to that.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ src/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9303954..7630540 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -344,7 +344,6 @@ gpg-error-config: gpgrt-config gpg-error-config-old
+ 	else                                                   \
+ 	  echo "no";                                           \
+ 	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
+-	  exit 1; \
+ 	fi
+ 	cp gpg-error-config-old $@
+ 
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
deleted file mode 100644
index b936d1143b..0000000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Upstream-Status: Backport [https://dev.gnupg.org/T4459]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-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>
----
- 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.37.bb
similarity index 91%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab0548d..b9a2b01c20 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,11 @@ 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 \
-	  "
+           file://0001-Do-not-fail-when-testing-config-scripts.patch \
+           "
 
-SRC_URI[md5sum] = "eff437f397e858a9127b76c0d87fa5ed"
-SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
+SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
+SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] libgpg-error: upgrade 1.36 -> 1.37
  2020-02-14 23:44 ` [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Wang Mingyu
@ 2020-02-15  8:03   ` Richard Purdie
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2020-02-15  8:03 UTC (permalink / raw)
  To: Wang Mingyu, openembedded-core

On Fri, 2020-02-14 at 15:44 -0800, Wang Mingyu wrote:
> libgpg-error-1.36-gawk5-support.patch
> Removed since it is included in 1.37.
> 
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>

Fails on x32:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1547

Cheers,

Richard



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] libgpg-error: upgrade 1.36 -> 1.37
  2020-02-14 23:44 [PATCH] ell: upgrade 0.27 -> 0.28 Wang Mingyu
@ 2020-02-14 23:44 ` Wang Mingyu
  2020-02-15  8:03   ` Richard Purdie
  0 siblings, 1 reply; 8+ messages in thread
From: Wang Mingyu @ 2020-02-14 23:44 UTC (permalink / raw)
  To: openembedded-core

libgpg-error-1.36-gawk5-support.patch
Removed since it is included in 1.37.

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 .../libgpg-error-1.36-gawk5-support.patch          | 144 ---------------------
 .../{libgpg-error_1.36.bb => libgpg-error_1.37.bb} |   5 +-
 2 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.36.bb => libgpg-error_1.37.bb} (92%)

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
deleted file mode 100644
index b936d11..0000000
--- a/meta/recipes-support/libgpg-error/libgpg-error/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Upstream-Status: Backport [https://dev.gnupg.org/T4459]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-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>
----
- 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.37.bb
similarity index 92%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
index b11ab05..bf1da84 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.36.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.37.bb
@@ -14,11 +14,10 @@ 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"
-SRC_URI[sha256sum] = "babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c"
+SRC_URI[md5sum] = "729f22d917494fdc4b54fce5aa6547c7"
+SRC_URI[sha256sum] = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
-- 
2.7.4





^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-02-28  9:28 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-26 18:39 [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Trevor Gamblin
2020-02-27 16:24 ` Trevor Gamblin
2020-02-27 23:14   ` Richard Purdie
2020-02-27 23:41     ` Trevor Gamblin
2020-02-28  9:28       ` Alexander Kanavin
  -- strict thread matches above, loose matches on Subject: below --
2020-02-28  9:25 Alexander Kanavin
2020-02-14 23:44 [PATCH] ell: upgrade 0.27 -> 0.28 Wang Mingyu
2020-02-14 23:44 ` [PATCH] libgpg-error: upgrade 1.36 -> 1.37 Wang Mingyu
2020-02-15  8:03   ` Richard Purdie

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.