Re: [OE-core] [PATCH 33/33] perl: backport gdbm 1.2x compatibility fixes

2021-11-03 Thread Alexander Kanavin
On Wed, 3 Nov 2021 at 09:39, Richard Purdie <
richard.pur...@linuxfoundation.org> wrote:

>
> I noticed we had a perl gdbm failure on both:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2782/steps/12/logs/stdio
> and
> https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2498
>
> (as well as lttng-tools)
>
> Is that related to this? The commit doesn't say why we need gdbm
> compatibility
> fixes?
>

Yes, the patches are needed to address the ptest failure when gdbm is
updated from 1.19 to 1.2something.

Alex

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157825): 
https://lists.openembedded.org/g/openembedded-core/message/157825
Mute This Topic: https://lists.openembedded.org/mt/86761744/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH 33/33] perl: backport gdbm 1.2x compatibility fixes

2021-11-03 Thread Richard Purdie
On Tue, 2021-11-02 at 09:43 +0100, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin 
> ---
>  ...e5fdd87aa205011512cd1e6cc655bcf677fd.patch | 31 ++
>  ...2398e766500cb5d83c4d76b642fcf31d997a.patch | 40 +++
>  ...297a58b8f10ab885c19eec48ea076116cc1f.patch | 25 
>  meta/recipes-devtools/perl/perl_5.34.0.bb |  3 ++
>  4 files changed, 99 insertions(+)
>  create mode 100644 
> meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
>  create mode 100644 
> meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
>  create mode 100644 
> meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch

I noticed we had a perl gdbm failure on both:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2782/steps/12/logs/stdio
and
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2498

(as well as lttng-tools)

Is that related to this? The commit doesn't say why we need gdbm compatibility
fixes?

Cheers,

Richard


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157824): 
https://lists.openembedded.org/g/openembedded-core/message/157824
Mute This Topic: https://lists.openembedded.org/mt/86761744/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH 33/33] perl: backport gdbm 1.2x compatibility fixes

2021-11-02 Thread Alexander Kanavin
Signed-off-by: Alexander Kanavin 
---
 ...e5fdd87aa205011512cd1e6cc655bcf677fd.patch | 31 ++
 ...2398e766500cb5d83c4d76b642fcf31d997a.patch | 40 +++
 ...297a58b8f10ab885c19eec48ea076116cc1f.patch | 25 
 meta/recipes-devtools/perl/perl_5.34.0.bb |  3 ++
 4 files changed, 99 insertions(+)
 create mode 100644 
meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
 create mode 100644 
meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
 create mode 100644 
meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch

diff --git 
a/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
 
b/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
new file mode 100644
index 00..1cb65d932c
--- /dev/null
+++ 
b/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
@@ -0,0 +1,31 @@
+From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff 
+Date: Wed, 23 Jun 2021 15:31:42 +0300
+Subject: [PATCH] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions.
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin 
+---
+ ext/GDBM_File/GDBM_File.xs | 9 +
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
+index 494c2889ca89..0125b5dcac4d 100644
+--- a/ext/GDBM_File/GDBM_File.xs
 b/ext/GDBM_File/GDBM_File.xs
+@@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size)
+ #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
+ #endif
+ 
+-#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
+-/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
+-   if the requested key did not exist */
+-# define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_NO_ERROR)
++#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
++/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested
++   key did not exist.  Other similar function wouls set GDBM_NO_ERROR instead.
++   The GDBM_ITEM_NOT_FOUND existeds as early as in 1.7.3 */
++# define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == 
GDBM_ITEM_NOT_FOUND)
+ #else
+ # define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_ITEM_NOT_FOUND)
+ #endif
diff --git 
a/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
 
b/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
new file mode 100644
index 00..628903f41c
--- /dev/null
+++ 
b/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
@@ -0,0 +1,40 @@
+From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff 
+Date: Wed, 23 Jun 2021 10:26:50 +0300
+Subject: [PATCH] Fix GDBM_File to compile with version 1.20 and earlier
+
+* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally,
+depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR.
+Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since
+gdbm commit d3e27957).
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin 
+---
+ ext/GDBM_File/GDBM_File.xs | 11 +--
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
+index cd0bb6f26ffa..494c2889ca89 100644
+--- a/ext/GDBM_File/GDBM_File.xs
 b/ext/GDBM_File/GDBM_File.xs
+@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size)
+ #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
+ #endif
+ 
+-#ifndef GDBM_ITEM_NOT_FOUND
+-# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR
+-#endif
+-
++#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
+ /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
+if the requested key did not exist */
+-#define ITEM_NOT_FOUND()\
+-(gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR)
++# define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_NO_ERROR)
++#else
++# define ITEM_NOT_FOUND()  (gdbm_errno == GDBM_ITEM_NOT_FOUND)
++#endif
+ 
+ #define CHECKDB(db) do {\
+ if (!db->dbp) { \
diff --git 
a/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch
 
b/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch
new file mode 100644
index 00..3864f1a121
--- /dev/null
+++ 
b/meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch
@@ -0,0 +1,25 @@
+From ea57297a58b8f10ab885c19eec48ea076116cc1f Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff 
+Date: Wed, 23 Jun 2021 14:24:47 +0300
+Subject: [PATCH] Raise version number in ext/GDBM_File/GDBM_File.pm
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin 
+
+---
+ ext/GDBM_File/GDBM_File.pm |