2007-08-14 14:38:32 +00:00
|
|
|
diff -up Python-2.5.1/setup.py.db46 Python-2.5.1/setup.py
|
2007-08-14 18:11:24 +00:00
|
|
|
--- Python-2.5.1/setup.py.db46 2007-08-14 12:53:45.000000000 -0400
|
|
|
|
|
+++ Python-2.5.1/setup.py 2007-08-14 14:11:08.000000000 -0400
|
|
|
|
|
@@ -606,9 +606,9 @@ class PyBuildExt(build_ext):
|
2007-08-14 14:38:32 +00:00
|
|
|
# a release. Most open source OSes come with one or more
|
|
|
|
|
# versions of BerkeleyDB already installed.
|
|
|
|
|
|
|
|
|
|
- max_db_ver = (4, 5)
|
|
|
|
|
+ max_db_ver = (4, 6)
|
|
|
|
|
min_db_ver = (3, 3)
|
2007-08-14 18:11:24 +00:00
|
|
|
- db_setup_debug = False # verbose debug prints from this script?
|
|
|
|
|
+ db_setup_debug = True # verbose debug prints from this script?
|
2007-08-14 14:38:32 +00:00
|
|
|
|
2007-08-14 18:11:24 +00:00
|
|
|
# construct a list of paths to look for the header file in on
|
|
|
|
|
# top of the normal inc_dirs.
|
2007-08-14 14:38:32 +00:00
|
|
|
@@ -623,7 +623,7 @@ class PyBuildExt(build_ext):
|
|
|
|
|
'/sw/include/db3',
|
|
|
|
|
]
|
|
|
|
|
# 4.x minor number specific paths
|
|
|
|
|
- for x in (0,1,2,3,4,5):
|
|
|
|
|
+ for x in (0,1,2,3,4,5,6):
|
|
|
|
|
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)
|
2007-08-14 18:11:24 +00:00
|
|
|
@@ -646,7 +646,7 @@ class PyBuildExt(build_ext):
|
|
|
|
|
for dn in inc_dirs:
|
|
|
|
|
std_variants.append(os.path.join(dn, 'db3'))
|
|
|
|
|
std_variants.append(os.path.join(dn, 'db4'))
|
|
|
|
|
- for x in (0,1,2,3,4):
|
|
|
|
|
+ for x in (0,1,2,3,4,5,6):
|
|
|
|
|
std_variants.append(os.path.join(dn, "db4%d"%x))
|
|
|
|
|
std_variants.append(os.path.join(dn, "db4.%d"%x))
|
|
|
|
|
for x in (2,3):
|
