Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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 0a4a7e13f3
commit c23178ba36
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -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

3
Misc/NEWS
View File

@ -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

2
setup.py
View File

@ -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)