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:16:20 (GMT)
commited909bcbddfa9c956fbbbb4a1b6a375d3e0e6599 (patch)
tree22db196f288f4f787835796d22a26c64600c2856
parent507eb09ad6b051821c50bdf723edd0c3119012e8 (diff)
downloadcpython-ed909bcbddfa9c956fbbbb4a1b6a375d3e0e6599.zip
cpython-ed909bcbddfa9c956fbbbb4a1b6a375d3e0e6599.tar.gz
cpython-ed909bcbddfa9c956fbbbb4a1b6a375d3e0e6599.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 74b191d..205f813 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -820,6 +820,7 @@ Dan Parisien
William Park
Harri Pasanen
Berker Peksag
+Andreas Pelme
Bo Peng
Joe Peterson
Randy Pausch
diff --git a/Misc/NEWS b/Misc/NEWS
index 2e07923..4f14dcd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1009,6 +1009,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 #3754: fix typo in pthread AC_CACHE_VAL.
- Issue #17029: Let h2py search the multiarch system include directory.
diff --git a/setup.py b/setup.py
index d9898ff..6435834 100644
--- a/setup.py
+++ b/setup.py
@@ -1012,7 +1012,7 @@ class PyBuildExt(build_ext):
with open(f) as file:
incf = file.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)