From ed909bcbddfa9c956fbbbb4a1b6a375d3e0e6599 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 23 Feb 2013 17:05:28 +0100 Subject: 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 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) -- cgit v0.12