summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2013-02-23 16:05:28 (GMT)
committerPetri Lehtinen <petri@digip.org>2013-02-23 16:05:28 (GMT)
commitc23178ba36097764bc3c1c33aa8dba2a0871e778 (patch)
tree3156993dd147b1c4c61fc3041b0bcfa9231ac39b
parent0a4a7e13f32d0bbbcaea30b4ace9feee3a73e8b1 (diff)
downloadcpython-c23178ba36097764bc3c1c33aa8dba2a0871e778.zip
cpython-c23178ba36097764bc3c1c33aa8dba2a0871e778.tar.gz
cpython-c23178ba36097764bc3c1c33aa8dba2a0871e778.tar.bz2
Issue #5033: Fix building of the sqlite3 extension module
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rw-r--r--setup.py2
3 files changed, 5 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 7574a6a..93c568c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -763,6 +763,7 @@ Randy Pausch
Samuele Pedroni
Marcel van der Peijl
Berker Peksag
+Andreas Pelme
Steven Pemberton
Bo Peng
Santiago Peresón
diff --git a/Misc/NEWS b/Misc/NEWS
index 58bcf7a..3a9d50b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -858,6 +858,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 #17228: Fix building without pymalloc.
- Issue #17086: Backport the patches from the 3.3 branch to cross-build
diff --git a/setup.py b/setup.py
index 24ce8bc..b728bf6 100644
--- a/setup.py
+++ b/setup.py
@@ -1114,7 +1114,7 @@ class PyBuildExt(build_ext):
if sqlite_setup_debug: print "sqlite: found %s"%f
incf = open(f).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)