Issue #5033: Fix building of the sqlite3 extension module

This commit is contained in:
Petri Lehtinen 2013-02-23 17:05:28 +01:00
parent 507eb09ad6
commit ed909bcbdd
3 changed files with 5 additions and 1 deletions

View file

@ -820,6 +820,7 @@ Dan Parisien
William Park William Park
Harri Pasanen Harri Pasanen
Berker Peksag Berker Peksag
Andreas Pelme
Bo Peng Bo Peng
Joe Peterson Joe Peterson
Randy Pausch Randy Pausch

View file

@ -1009,6 +1009,9 @@ Tests
Build 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 #3754: fix typo in pthread AC_CACHE_VAL.
- Issue #17029: Let h2py search the multiarch system include directory. - Issue #17029: Let h2py search the multiarch system include directory.

View file

@ -1012,7 +1012,7 @@ class PyBuildExt(build_ext):
with open(f) as file: with open(f) as file:
incf = file.read() incf = file.read()
m = re.search( m = re.search(
r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf) r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"([\d\.]*)"', incf)
if m: if m:
sqlite_version = m.group(1) sqlite_version = m.group(1)
sqlite_version_tuple = tuple([int(x) sqlite_version_tuple = tuple([int(x)