Issue #5033: Fix building of the sqlite3 extension module

2013-02-23 17:05:28 +01:00 · 2013-02-23 17:05:28 +01:00 · c23178ba36
parent 0a4a7e13f3
commit c23178ba36
3 changed files with 5 additions and 1 deletions
--- 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
--- 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
--- 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)