Attachment 232026 Details for Bug 262136 – Patch file

[patch] Patch file

databases_py-bsddb3.patch (text/plain), 2.51 KB, created by Yasuhiro Kimura on 2022-02-23 06:42:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-02-23 06:42:58 UTC

Size: 2.51 KB

patch

obsolete

>From 91d2e61d53cd9c6563e26247c8d6ac32751a12a5 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Sat, 5 Feb 2022 20:05:30 +0900
>Subject: [PATCH] databases/py-bsddb3: Fix build when default version of
> berkeley db is 18
>
>---
> databases/py-bsddb3/files/patch-setup3.py | 29 +++++++++++++++++++----
> 1 file changed, 25 insertions(+), 4 deletions(-)
>
>diff --git a/databases/py-bsddb3/files/patch-setup3.py b/databases/py-bsddb3/files/patch-setup3.py
>index 3ff9359b825d..12b55a60b6d0 100644
>--- a/databases/py-bsddb3/files/patch-setup3.py
>+++ b/databases/py-bsddb3/files/patch-setup3.py
>@@ -1,6 +1,6 @@
>---- setup3.py.orig	2016-02-08 21:18:47 UTC
>+--- setup3.py.orig	2020-11-26 15:38:58 UTC
> +++ setup3.py
>-@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
>+@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.version_info >= 
>              category=DeprecationWarning)
>  
>  
>@@ -13,7 +13,17 @@
>  from distutils.dep_util import newer
>  import distutils.ccompiler
>  
>-@@ -288,8 +284,8 @@ if os.name == 'posix':
>+@@ -152,7 +148,8 @@ if os.name == 'posix':
>+         lflags_arg = LFLAGS + LIBS
>+ 
>+     # Supported Berkeley DB versions, in order of preference.
>+-    db_ver_list = ((6, 2), (6, 1),
>++    db_ver_list = ((18, 1), (18, 0),
>++            (6, 2), (6, 1),
>+             (5, 3), (5, 1),
>+             (4, 8), (4, 7))
>+     db_ver = None
>+@@ -298,8 +295,8 @@ if os.name == 'posix':
>          incdir = os.path.join(BERKELEYDB_DIR, 'include')
>      if not libdir:
>          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
>@@ -24,7 +34,7 @@
>      else:
>          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
>          libname = []
>-@@ -328,7 +324,7 @@ if os.name == 'posix':
>+@@ -338,7 +335,7 @@ if os.name == 'posix':
>  
>      # read db.h to figure out what version of Berkeley DB this is
>      ver = None
>@@ -33,3 +43,14 @@
>          db_h_lines = f.readlines()
>      db_ver_re = re.compile(
>          r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
>+@@ -350,8 +347,8 @@ if os.name == 'posix':
>+         if not match:
>+             continue
>+         fullverstr = match.group(1)
>+-        ver = fullverstr[0] + fullverstr[2]   # 31 == 3.1, 32 == 3.2, etc.
>+-        db_ver = (int(fullverstr[0]), int(fullverstr[2]))
>++        ver = fullverstr.split('.')
>++        db_ver = (int(ver[0]), int(ver[1]))
>+     if (db_ver2 is not None) and (db_ver != db_ver2) :
>+         raise AssertionError("Detected Berkeley DB version is inconsistent")
>+     if db_ver not in db_ver_list:
>-- 
>2.35.1
>

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 262136: 232026 | 232097