merge of r58091 from trunk:

Don't allow BerkeleyDB 4.6.x as the current 4.6.19 release is prone
to lockups.  We'll reenable it once a good 4.6.x release exists.
This commit is contained in:
Gregory P. Smith 2007-09-10 16:38:12 +00:00
parent da86fcc803
commit 954c31bcc7

View file

@ -637,7 +637,9 @@ class PyBuildExt(build_ext):
# a release. Most open source OSes come with one or more # a release. Most open source OSes come with one or more
# versions of BerkeleyDB already installed. # versions of BerkeleyDB already installed.
max_db_ver = (4, 6) # XXX(gps) - Do not allow BerkeleyDB 4.6.x until Oracle fixes
# the DB_HASH lockup bug that is present in 4.6.19.
max_db_ver = (4, 5)
min_db_ver = (3, 3) min_db_ver = (3, 3)
db_setup_debug = False # verbose debug prints from this script? db_setup_debug = False # verbose debug prints from this script?
@ -655,7 +657,7 @@ class PyBuildExt(build_ext):
'/sw/include/db3', '/sw/include/db3',
] ]
# 4.x minor number specific paths # 4.x minor number specific paths
for x in (0,1,2,3,4,5,6): for x in range(max_db_ver[1]+1):
db_inc_paths.append('/usr/include/db4%d' % x) db_inc_paths.append('/usr/include/db4%d' % x)
db_inc_paths.append('/usr/include/db4.%d' % x) db_inc_paths.append('/usr/include/db4.%d' % x)
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)