79 lines
2.2 KiB
Diff
79 lines
2.2 KiB
Diff
|
--- Modules/_bsddb.c
|
||
|
|
+++ Modules/_bsddb.c
|
||
|
|
@@ -4129,6 +4129,8 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
+#if (DBVER < 45)
|
||
|
|
+
|
||
|
|
static PyObject*
|
||
|
|
DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
|
||
|
|
{
|
||
|
|
@@ -4145,6 +4147,7 @@
|
||
|
|
RETURN_NONE();
|
||
|
|
}
|
||
|
|
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#if (DBVER >= 32)
|
||
|
|
|
||
|
|
@@ -5233,7 +5236,9 @@
|
||
|
|
{"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
|
||
|
|
#endif
|
||
|
|
{"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS},
|
||
|
|
+#if (DBVER < 45)
|
||
|
|
{"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS},
|
||
|
|
+#endif
|
||
|
|
#if (DBVER >= 32)
|
||
|
|
{"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
|
||
|
|
{"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
|
||
|
|
@@ -5835,7 +5840,9 @@
|
||
|
|
ADD_INT(d, DB_AFTER);
|
||
|
|
ADD_INT(d, DB_APPEND);
|
||
|
|
ADD_INT(d, DB_BEFORE);
|
||
|
|
+#if (DBVER < 45)
|
||
|
|
ADD_INT(d, DB_CACHED_COUNTS);
|
||
|
|
+#endif
|
||
|
|
#if (DBVER >= 41)
|
||
|
|
_addIntToDict(d, "DB_CHECKPOINT", 0);
|
||
|
|
#else
|
||
|
|
@@ -5870,7 +5877,9 @@
|
||
|
|
ADD_INT(d, DB_POSITION);
|
||
|
|
ADD_INT(d, DB_PREV);
|
||
|
|
ADD_INT(d, DB_PREV_NODUP);
|
||
|
|
+#if (DBVER < 45)
|
||
|
|
ADD_INT(d, DB_RECORDCOUNT);
|
||
|
|
+#endif
|
||
|
|
ADD_INT(d, DB_SET);
|
||
|
|
ADD_INT(d, DB_SET_RANGE);
|
||
|
|
ADD_INT(d, DB_SET_RECNO);
|
||
|
|
--- setup.py
|
||
|
|
+++ setup.py
|
||
|
|
@@ -609,7 +609,7 @@
|
||
|
|
# a release. Most open source OSes come with one or more
|
||
|
|
# versions of BerkeleyDB already installed.
|
||
|
|
|
||
|
|
- max_db_ver = (4, 4)
|
||
|
|
+ max_db_ver = (4, 5)
|
||
|
|
min_db_ver = (3, 3)
|
||
|
|
db_setup_debug = False # verbose debug prints from this script?
|
||
|
|
|
||
|
|
@@ -626,7 +626,7 @@
|
||
|
|
'/sw/include/db3',
|
||
|
|
]
|
||
|
|
# 4.x minor number specific paths
|
||
|
|
- for x in (0,1,2,3,4):
|
||
|
|
+ for x in (0,1,2,3,4,5):
|
||
|
|
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)
|
||
|
|
@@ -649,7 +649,7 @@
|
||
|
|
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):
|
||
|
|
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):
|