Issue #5033: Fix building of the sqlite3 extension module

This commit is contained in:
Petri Lehtinen 2013-02-23 17:24:44 +01:00
commit d784e53d96
3 changed files with 5 additions and 1 deletions

View File

@ -917,6 +917,7 @@ Samuele Pedroni
Justin Peel Justin Peel
Marcel van der Peijl Marcel van der Peijl
Berker Peksag Berker Peksag
Andreas Pelme
Steven Pemberton Steven Pemberton
Bo Peng Bo Peng
Santiago Peresón Santiago Peresón

View File

@ -945,6 +945,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 #17228: Fix building without pymalloc. - Issue #17228: Fix building without pymalloc.
- Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac. - Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.

View File

@ -1073,7 +1073,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)