bpo-31525: Increase minimum sqlite version number check (GH-12923)

This commit is contained in:
Charles Pigott 2019-04-26 16:38:12 +01:00 committed by Berker Peksag
parent 06d04e77ca
commit ad0daf5b37
1 changed files with 3 additions and 3 deletions

View File

@ -1299,7 +1299,7 @@ class PyBuildExt(build_ext):
sqlite_setup_debug = False # verbose debug prints from this script? sqlite_setup_debug = False # verbose debug prints from this script?
# We hunt for #define SQLITE_VERSION "n.n.n" # We hunt for #define SQLITE_VERSION "n.n.n"
# We need to find >= sqlite version 3.0.8 # We need to find >= sqlite version 3.3.9, for sqlite3_prepare_v2
sqlite_incdir = sqlite_libdir = None sqlite_incdir = sqlite_libdir = None
sqlite_inc_paths = [ '/usr/include', sqlite_inc_paths = [ '/usr/include',
'/usr/include/sqlite', '/usr/include/sqlite',
@ -1310,7 +1310,7 @@ class PyBuildExt(build_ext):
] ]
if CROSS_COMPILING: if CROSS_COMPILING:
sqlite_inc_paths = [] sqlite_inc_paths = []
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8) MIN_SQLITE_VERSION_NUMBER = (3, 3, 9)
MIN_SQLITE_VERSION = ".".join([str(x) MIN_SQLITE_VERSION = ".".join([str(x)
for x in MIN_SQLITE_VERSION_NUMBER]) for x in MIN_SQLITE_VERSION_NUMBER])
@ -1344,7 +1344,7 @@ class PyBuildExt(build_ext):
break break
else: else:
if sqlite_setup_debug: if sqlite_setup_debug:
print("%s: version %d is too old, need >= %s"%(d, print("%s: version %s is too old, need >= %s"%(d,
sqlite_version, MIN_SQLITE_VERSION)) sqlite_version, MIN_SQLITE_VERSION))
elif sqlite_setup_debug: elif sqlite_setup_debug:
print("sqlite: %s had no SQLITE_VERSION"%(f,)) print("sqlite: %s had no SQLITE_VERSION"%(f,))