summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2013-02-23 16:24:00 (GMT)
committerPetri Lehtinen <petri@digip.org>2013-02-23 16:24:00 (GMT)
commitd2132144a475bad3676f80d55098b0daba6110f4 (patch)
tree9a97f1d4ecd0b766a942cdacc4ad9386d6360b48
parent18809fa94eb5840421857ed4eabf36f5141fd874 (diff)
parented909bcbddfa9c956fbbbb4a1b6a375d3e0e6599 (diff)
downloadcpython-d2132144a475bad3676f80d55098b0daba6110f4.zip
cpython-d2132144a475bad3676f80d55098b0daba6110f4.tar.gz
cpython-d2132144a475bad3676f80d55098b0daba6110f4.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 3fa29ef..d0978e7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -908,6 +908,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 a184bfc..4945054 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -694,6 +694,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 57dabc1..a70909c 100644
--- a/setup.py
+++ b/setup.py
@@ -1062,7 +1062,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)