Issue #5033: Fix building of the sqlite3 extension module

diff --git a/Misc/ACKS b/Misc/ACKS
index 7574a6a1b1c1b90e090a139812c26cb413e7ef28..93c568c7c0e31f1efda795881aed73be2934ed7c 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -763,6 +763,7 @@ Randy Pausch
 Samuele Pedroni
 Marcel van der Peijl
 Berker Peksag
+Andreas Pelme
 Steven Pemberton
 Bo Peng
 Santiago Peresón

diff --git a/Misc/NEWS b/Misc/NEWS
index 58bcf7a59fa4a372e33a09efaadb00674cd22fa4..3a9d50b7bc68aa0c35a38c2c2684abc10f560af0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -858,6 +858,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 #17228: Fix building without pymalloc.
 
 - Issue #17086: Backport the patches from the 3.3 branch to cross-build

diff --git a/setup.py b/setup.py
index 24ce8bce4922aecd696c70acfe54f1225f379767..b728bf65a08430c9c3dc2f211aded0d457156682 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1114,7 +1114,7 @@ class PyBuildExt(build_ext):
                 if sqlite_setup_debug: print "sqlite: found %s"%f
                 incf = open(f).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)