source: scripts/untested/blfs-patches/Python-2.4-db43-1.patch@ fd5b1fe

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since fd5b1fe was 617118d, checked in by Jim Gifford <clfs@…>, 19 years ago

r561@server (orig r559): root | 2005-06-05 02:38:49 -0700
Fixed Directory Structure
  • Property mode set to 100644
File size: 2.8 KB

  • Python-2.3.4/Modules/_bsddb.c 

    Submitted By:            Igor Zivkovic <igor@linuxfromscratch.org>
Date:                    2004-12-09
Initial Package Version: 2.3.4
Upstream Status:         Submitted at Python patch tracker.
Origin:                  Michal Cihar and Suzuki Hisao
Description:             Adds support for Berkeley DB-4.3.x.

$LastChangedBy: igor $
$Date: 2005-01-10 15:43:51 -0700 (Mon, 10 Jan 2005) $
    old new  
    422422/* Callback used to save away more information about errors from the DB
    423423 * library. */
    424424static char _db_errmsg[1024];
    425 static void _db_errorCallback(const char* prefix, char* msg)
     425static void _db_errorCallback(
     426#if (DBVER >= 43)
     427        const DB_ENV *dbenv,
     428#endif
     429        const char* prefix,
     430#if (DBVER >= 43)
     431        const
     432#endif
     433        char* msg)
    426434{
    427435    strcpy(_db_errmsg, msg);
    428436}
    … …  
    19871995
    19881996    MYDB_BEGIN_ALLOW_THREADS;
    19891997#if (DBVER >= 33)
    1990     err = self->db->stat(self->db, &sp, flags);
     1998    err = self->db->stat(self->db,
     1999#if (DBVER >= 43)
     2000            NULL /*txnid*/,
     2001#endif
     2002            &sp, flags);
    19912003#else
    19922004    err = self->db->stat(self->db, &sp, NULL, flags);
    19932005#endif
    … …  
    22492261
    22502262    MYDB_BEGIN_ALLOW_THREADS;
    22512263#if (DBVER >= 33)
    2252     err = self->db->stat(self->db, &sp, flags);
     2264    err = self->db->stat(self->db,
     2265#if (DBVER >= 43)
     2266            NULL /*txnid*/,
     2267#endif
     2268            &sp, flags);
    22532269#else
    22542270    err = self->db->stat(self->db, &sp, NULL, flags);
    22552271#endif
    … …  
    23752391    err = self->db->get(self->db, txn, &key, &data, 0);
    23762392    MYDB_END_ALLOW_THREADS;
    23772393    FREE_DBT(key);
     2394#if (DBVER >= 43)
     2395    return PyInt_FromLong((err == DB_BUFFER_SMALL) || (err == 0));
     2396#else
    23782397    return PyInt_FromLong((err == ENOMEM) || (err == 0));
     2398#endif
    23792399}
    23802400
    23812401
    … …  
    45274547
    45284548#if (DBVER >= 33)
    45294549    ADD_INT(d, DB_LSTAT_ABORTED);
     4550#if (DBVER < 43)
    45304551    ADD_INT(d, DB_LSTAT_ERR);
     4552#endif
     4553#if (DBVER >= 42)
     4554    ADD_INT(d, DB_LSTAT_EXPIRED);
     4555#endif
    45314556    ADD_INT(d, DB_LSTAT_FREE);
    45324557    ADD_INT(d, DB_LSTAT_HELD);
    45334558#if (DBVER == 33)

  • Python-2.3.4/setup.py

    old new  
    480480        # when sorted in reverse order, keys for this dict must appear in the
    481481        # order you wish to search - e.g., search for db4 before db3
    482482        db_try_this = {
    483             'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
     483            'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
    484484                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
    485485                                '/usr/local/BerkeleyDB.4.1/lib',
    486486                                '/usr/local/BerkeleyDB.4.0/lib',
Note: See TracBrowser for help on using the repository browser.