From: Petri Lehtinen <petri@digip.org>
Date: Sat, 23 Feb 2013 16:05:28 +0000 (+0100)
Subject: Issue #5033: Fix building of the sqlite3 extension module
X-Git-Tag: v2.7.4rc1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c23178ba36097764bc3c1c33aa8dba2a0871e778;p=python

Issue #5033: Fix building of the sqlite3 extension module
---

diff --git a/Misc/ACKS b/Misc/ACKS
index 7574a6a1b1..93c568c7c0 100644
--- 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 58bcf7a59f..3a9d50b7bc 100644
--- 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 24ce8bce49..b728bf65a0 100644
--- 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)