Issue #5033: Fix building of the sqlite3 extension module

2013-02-23 17:24:44 +01:00 · 2013-02-23 17:24:44 +01:00 · d784e53d96
parent 4eb9f5000e d2132144a4
commit d784e53d96
3 changed files with 5 additions and 1 deletions
--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -917,6 +917,7 @@ Samuele Pedroni
 Justin Peel
 Marcel van der Peijl
 Berker Peksag
+Andreas Pelme
 Steven Pemberton
 Bo Peng
 Santiago Peresón
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -945,6 +945,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 #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.
--- a/setup.py
+++ b/setup.py
@ -1073,7 +1073,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)