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 · ed909bcbdd
parent 507eb09ad6
commit ed909bcbdd
3 changed files with 5 additions and 1 deletions
--- 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
--- 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.
--- 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)