Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1254
Modified Files:
python26-10.6.info python26-10.6.patch python26.info
Log Message:
let x86_64 use new db also
Index: python26-10.6.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python26-10.6.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python26-10.6.patch 15 Feb 2010 05:34:48 -0000 1.3
+++ python26-10.6.patch 19 Mar 2010 14:40:25 -0000 1.4
@@ -1,3 +1,45 @@
+diff -Nurd -x'*~' Python-2.6.4.orig/Lib/bsddb/test/test_basics.py
Python-2.6.4/Lib/bsddb/test/test_basics.py
+--- Python-2.6.4.orig/Lib/bsddb/test/test_basics.py 2009-07-02
11:37:21.000000000 -0400
++++ Python-2.6.4/Lib/bsddb/test/test_basics.py 2010-03-18 10:37:10.000000000
-0400
+@@ -1032,11 +1032,12 @@
+ # # See http://bugs.python.org/issue3307
+ # self.assertRaises(db.DBInvalidArgError, db.DB, None, 65535)
+
+- def test02_DBEnv_dealloc(self):
+- # http://bugs.python.org/issue3885
+- import gc
+- self.assertRaises(db.DBInvalidArgError, db.DBEnv, ~db.DB_RPCCLIENT)
+- gc.collect()
++ if db.version() < (4, 8) :
++ def test02_DBEnv_dealloc(self):
++ # http://bugs.python.org/issue3885
++ import gc
++ self.assertRaises(db.DBInvalidArgError, db.DBEnv,
~db.DB_RPCCLIENT)
++ gc.collect()
+
+
+ #----------------------------------------------------------------------
+diff -Nurd -x'*~'
Python-2.6.4.orig/Lib/bsddb/test/test_distributed_transactions.py
Python-2.6.4/Lib/bsddb/test/test_distributed_transactions.py
+--- Python-2.6.4.orig/Lib/bsddb/test/test_distributed_transactions.py
2008-08-31 10:00:51.000000000 -0400
++++ Python-2.6.4/Lib/bsddb/test/test_distributed_transactions.py
2010-03-18 10:37:10.000000000 -0400
+@@ -35,7 +35,7 @@
+ db.DB_INIT_TXN | db.DB_INIT_LOG | db.DB_INIT_MPOOL |
+ db.DB_INIT_LOCK, 0666)
+ self.db = db.DB(self.dbenv)
+- self.db.set_re_len(db.DB_XIDDATASIZE)
++ self.db.set_re_len(db.DB_GID_SIZE)
+ if must_open_db :
+ if db.version() > (4,1) :
+ txn=self.dbenv.txn_begin()
+@@ -76,7 +76,7 @@
+ # let them be garbage collected.
+ for i in xrange(self.num_txns) :
+ txn = self.dbenv.txn_begin()
+- gid = "%%%dd" %db.DB_XIDDATASIZE
++ gid = "%%%dd" %db.DB_GID_SIZE
+ gid = adapt(gid %i)
+ self.db.put(i, gid, txn=txn, flags=db.DB_APPEND)
+ txns.add(gid)
diff -Nurd -x'*~' Python-2.6.4.orig/Makefile.pre.in
Python-2.6.4/Makefile.pre.in
--- Python-2.6.4.orig/Makefile.pre.in 2009-09-24 15:22:45.000000000 -0400
+++ Python-2.6.4/Makefile.pre.in 2009-12-10 23:56:21.000000000 -0500
@@ -56,6 +98,114 @@
libs.insert(0, '-L' + getvar('LIBPL'))
print ' '.join(libs)
+diff -Nurd -x'*~' Python-2.6.4.orig/Modules/_bsddb.c
Python-2.6.4/Modules/_bsddb.c
+--- Python-2.6.4.orig/Modules/_bsddb.c 2008-09-23 14:54:08.000000000 -0400
++++ Python-2.6.4/Modules/_bsddb.c 2010-03-18 10:37:10.000000000 -0400
+@@ -215,6 +215,10 @@
+ #define DB_BUFFER_SMALL ENOMEM
+ #endif
+
++#if (DBVER < 48)
++#define DB_GID_SIZE DB_XIDDATASIZE
++#endif
++
+
+ /* --------------------------------------------------------------------- */
+ /* Structure definitions */
+@@ -4501,7 +4505,11 @@
+ DBTxnObject *txn;
+ #define PREPLIST_LEN 16
+ DB_PREPLIST preplist[PREPLIST_LEN];
++#if (DBVER < 48)
+ long retp;
++#else
++ u_int32_t retp;
++#endif
+
+ CHECK_ENV_NOT_CLOSED(self);
+
+@@ -4522,7 +4530,7 @@
+ flags=DB_NEXT; /* Prepare for next loop pass */
+ for (i=0; i<retp; i++) {
+ gid=PyBytes_FromStringAndSize((char *)(preplist[i].gid),
+- DB_XIDDATASIZE);
++ DB_GID_SIZE);
+ if (!gid) {
+ Py_DECREF(list);
+ return NULL;
+@@ -5047,6 +5055,7 @@
+ }
+
+
++#if (DBVER < 48)
+ static PyObject*
+ DBEnv_set_rpc_server(DBEnvObject* self, PyObject* args, PyObject* kwargs)
+ {
+@@ -5068,6 +5077,7 @@
+ RETURN_IF_ERR();
+ RETURN_NONE();
+ }
++#endif
+
+ static PyObject*
+ DBEnv_set_verbose(DBEnvObject* self, PyObject* args)
+@@ -5947,9 +5957,9 @@
+ if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
+ return NULL;
+
+- if (gid_size != DB_XIDDATASIZE) {
++ if (gid_size != DB_GID_SIZE) {
+ PyErr_SetString(PyExc_TypeError,
+- "gid must be DB_XIDDATASIZE bytes long");
++ "gid must be DB_GID_SIZE bytes long");
+ return NULL;
+ }
+
+@@ -6539,8 +6549,10 @@
+ #endif
+ {"set_get_returns_none",(PyCFunction)DBEnv_set_get_returns_none,
METH_VARARGS},
+ {"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_NOARGS},
++#if (DBVER < 48)
+ {"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server,
+ METH_VARARGS||METH_KEYWORDS},
++#endif
+ {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS},
+ #if (DBVER >= 42)
+ {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS},
+@@ -7089,6 +7101,7 @@
+ ADD_INT(d, DB_MAX_PAGES);
+ ADD_INT(d, DB_MAX_RECORDS);
+
++#if (DBVER < 48)
+ #if (DBVER >= 42)
+ ADD_INT(d, DB_RPCCLIENT);
+ #else
+@@ -7096,7 +7109,11 @@
+ /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */
+ _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
+ #endif
++#endif
++
++#if (DBVER < 48)
+ ADD_INT(d, DB_XA_CREATE);
++#endif
+
+ ADD_INT(d, DB_CREATE);
+ ADD_INT(d, DB_NOMMAP);
+@@ -7113,7 +7130,13 @@
+ ADD_INT(d, DB_INIT_TXN);
+ ADD_INT(d, DB_JOINENV);
+
++#if (DBVER >= 48)
++ ADD_INT(d, DB_GID_SIZE);
++#else
+ ADD_INT(d, DB_XIDDATASIZE);
++ /* Allow new code to work in old BDB releases */
++ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE);
++#endif
+
+ ADD_INT(d, DB_RECOVER);
+ ADD_INT(d, DB_RECOVER_FATAL);
diff -Nurd -x'*~' Python-2.6.4.orig/Modules/posixmodule.c
Python-2.6.4/Modules/posixmodule.c
--- Python-2.6.4.orig/Modules/posixmodule.c 2009-09-16 16:06:36.000000000
-0400
+++ Python-2.6.4/Modules/posixmodule.c 2009-12-10 23:56:21.000000000 -0500
@@ -370,6 +520,15 @@
name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h')
if os.path.isfile(name):
try:
+@@ -705,7 +707,7 @@
+ # a release. Most open source OSes come with one or more
+ # versions of BerkeleyDB already installed.
+
+- max_db_ver = (4, 7)
++ max_db_ver = (4, 8)
+ min_db_ver = (3, 3)
+ db_setup_debug = False # verbose debug prints from this script?
+
@@ -741,50 +743,9 @@
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
Index: python26-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python26-10.6.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- python26-10.6.info 15 Feb 2010 05:34:48 -0000 1.3
+++ python26-10.6.info 19 Mar 2010 14:40:25 -0000 1.4
@@ -1,6 +1,6 @@
Package: python26
Version: 2.6.4
-Revision: 102
+Revision: 103
Epoch: 1
Distribution: 10.6
Maintainer: Daniel Macks <[email protected]>
@@ -8,7 +8,7 @@
%N-shlibs (= %e:%v-%r),
blt-shlibs,
bzip2-shlibs,
- db47-aes-shlibs | db47-shlibs,
+ db48-aes-shlibs | db48-shlibs,
gdbm3-shlibs,
libgettext8-shlibs,
libncursesw5-shlibs,
@@ -21,7 +21,7 @@
BuildDepends: <<
blt-dev (>= 2.4z-15),
bzip2-dev,
- db47-aes | db47,
+ db48-aes | db48,
fink (>= 0.24.12-1),
gdbm3,
gettext-bin,
@@ -39,7 +39,7 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: 349ccac9cacc80a9ed3b3d4724eeda66
PatchFile: %n-10.6.patch
-PatchFile-MD5: 06a4ffefee39dd19b5a76811a4651e6d
+PatchFile-MD5: cb44088cc774bae257799a17638f0a78
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SetLDFLAGS: -L%p/lib/system-openssl/lib
ConfigureParams: --enable-shared
@@ -159,7 +159,9 @@
-config script to continue this tradition (bug in previous
versions accidentally did the Right Thing here).
- Cannot use higher than db47
+ Upstream patch to allow using higher than db47. See:
+ http://bugs.python.org/issue6949
+ http://bugs.python.org/file16549/python-support_bdb-4.8-v2.patch
<<
DescPort: <<
libpython needs to link to CF because that lib has the parent
Index: python26.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/python26.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- python26.info 18 Mar 2010 15:53:16 -0000 1.12
+++ python26.info 19 Mar 2010 14:40:26 -0000 1.13
@@ -39,7 +39,6 @@
Source2: http://www.python.org/ftp/python/doc/%v/python-%v-docs-html.tar.bz2
Source2-MD5: 349ccac9cacc80a9ed3b3d4724eeda66
PatchFile: %n.patch
-#PatchFile-MD5: 518059738c1dc5a35288929aa1ead88e
PatchFile-MD5: 01b8da8cd4762bfbf465cb44cf3268e9
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SetLDFLAGS: -L%p/lib/system-openssl/lib
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
