summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2013-02-23 17:24:44 +0100
committerPetri Lehtinen <petri@digip.org>2013-02-23 17:24:44 +0100
commitd784e53d9683b26822cc08b02a4bc6cb5a482e66 (patch)
tree2d33f07be270d25ddc00b8dc4611a9d76041ab81
parent4eb9f5000e0ee147b15fd6d1b0db3237ad3638f3 (diff)
parentd2132144a475bad3676f80d55098b0daba6110f4 (diff)
downloadcpython-git-d784e53d9683b26822cc08b02a4bc6cb5a482e66.tar.gz
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 9d557a6cab..bb037ed48e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -917,6 +917,7 @@ Samuele Pedroni
Justin Peel
Marcel van der Peijl
Berker Peksag
+Andreas Pelme
Steven Pemberton
Bo Peng
Santiago Peresón
diff --git a/Misc/NEWS b/Misc/NEWS
index 07c86db10f..a2777cede5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -945,6 +945,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 #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.
diff --git a/setup.py b/setup.py
index 4fd8efc4d2..144767fbb8 100644
--- a/setup.py
+++ b/setup.py
@@ -1073,7 +1073,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)