ALT Linux repos
Group :: Development/Python
RPM: python
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: python-2.3.4-libdb43.patch
Download
Download
diff -urN Python-2.3.4.old/Modules/_bsddb.c Python-2.3.4/Modules/_bsddb.c
--- Python-2.3.4.old/Modules/_bsddb.c 2004-03-16 10:47:45 +0300
+++ Python-2.3.4/Modules/_bsddb.c 2005-02-13 14:56:43 +0300
@@ -96,7 +96,6 @@
#define PY_BSDDB_VERSION "4.2.0.2"
static char *rcs_id = "$Id: _bsddb.c,v 1.17.6.4 2004/03/16 07:47:45 greg Exp $";
-
#ifdef WITH_THREAD
/* These are for when calling Python --> C */
@@ -1986,7 +1985,10 @@
CHECK_DB_NOT_CLOSED(self);
MYDB_BEGIN_ALLOW_THREADS;
-#if (DBVER >= 33)
+#if (DBVER >= 43)
+ # warning Untested code from cray
+ err = self->db->stat(self->db, NULL, &sp, flags);
+#elif (DBVER >= 33)
err = self->db->stat(self->db, &sp, flags);
#else
err = self->db->stat(self->db, &sp, NULL, flags);
@@ -2248,7 +2250,10 @@
}
MYDB_BEGIN_ALLOW_THREADS;
-#if (DBVER >= 33)
+#if (DBVER >= 43)
+ # warning untestef code from cray
+ err = self->db->stat(self->db, NULL, &sp, flags);
+#elif (DBVER >= 33)
err = self->db->stat(self->db, &sp, flags);
#else
err = self->db->stat(self->db, &sp, NULL, flags);
@@ -4527,7 +4532,10 @@
#if (DBVER >= 33)
ADD_INT(d, DB_LSTAT_ABORTED);
+#if (DBVER < 43)
+ # warning Untested code from cray
ADD_INT(d, DB_LSTAT_ERR);
+#endif
ADD_INT(d, DB_LSTAT_FREE);
ADD_INT(d, DB_LSTAT_HELD);
#if (DBVER == 33)
diff -urN Python-2.3.4.old/setup.py Python-2.3.4/setup.py
--- Python-2.3.4.old/setup.py 2005-02-13 15:44:03 +0300
+++ Python-2.3.4/setup.py 2005-02-13 14:00:51 +0300
@@ -483,7 +483,7 @@
# when sorted in reverse order, keys for this dict must appear in the
# order you wish to search - e.g., search for db4 before db3
db_try_this = {
- 'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+ 'db4': {'libs': ('db-4.3', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
'/usr/local/BerkeleyDB.4.1/lib',
'/usr/local/BerkeleyDB.4.0/lib',