Commit c23178ba authored by Petri Lehtinen's avatar Petri Lehtinen

Issue #5033: Fix building of the sqlite3 extension module

parent 0a4a7e13
...@@ -763,6 +763,7 @@ Randy Pausch ...@@ -763,6 +763,7 @@ Randy Pausch
Samuele Pedroni Samuele Pedroni
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
......
...@@ -858,6 +858,9 @@ Tests ...@@ -858,6 +858,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 #17086: Backport the patches from the 3.3 branch to cross-build - Issue #17086: Backport the patches from the 3.3 branch to cross-build
......
...@@ -1114,7 +1114,7 @@ class PyBuildExt(build_ext): ...@@ -1114,7 +1114,7 @@ class PyBuildExt(build_ext):
if sqlite_setup_debug: print "sqlite: found %s"%f if sqlite_setup_debug: print "sqlite: found %s"%f
incf = open(f).read() incf = open(f).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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment