From c23178ba36097764bc3c1c33aa8dba2a0871e778 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 23 Feb 2013 17:05:28 +0100 Subject: [PATCH] Issue #5033: Fix building of the sqlite3 extension module --- Misc/ACKS | 1 + Misc/NEWS | 3 +++ setup.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Misc/ACKS b/Misc/ACKS index 7574a6a1b1c..93c568c7c0e 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 58bcf7a59fa..3a9d50b7bc6 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 24ce8bce492..b728bf65a08 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)