Issue #5033: Fix building of the sqlite3 extension module

diff --git a/Misc/ACKS b/Misc/ACKS
index 74b191d3266a296cd138a353c9da999d2ac2c963..205f81327d0c83b33a073eb20e65b87876aa5921 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -820,6 +820,7 @@ Dan Parisien
 William Park
 Harri Pasanen
 Berker Peksag
+Andreas Pelme
 Bo Peng
 Joe Peterson
 Randy Pausch

diff --git a/Misc/NEWS b/Misc/NEWS
index 2e07923680ca860192e9fee069c53a20a1355590..4f14dcdb9ee227dcde423236898ae60ca7774fdc 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1009,6 +1009,9 @@ Tests
 Build
 -----
 
+- Issue #5033: Fix building of the sqlite3 extension module when the
+  SQLite library version has "beta" in it. Patch by Andreas Pelme.
+
 - Issue #3754: fix typo in pthread AC_CACHE_VAL.
 
 - Issue #17029: Let h2py search the multiarch system include directory.

diff --git a/setup.py b/setup.py
index d9898ff2f8646c7a925d70810a7fed08bb1793c5..64358341e71bd849e69c6bc6c9d77c101773a8e3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1012,7 +1012,7 @@ class PyBuildExt(build_ext):
                 with open(f) as file:
                     incf = file.read()
                 m = re.search(
-                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
+                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"([\d\.]*)"', incf)
                 if m:
                     sqlite_version = m.group(1)
                     sqlite_version_tuple = tuple([int(x)