diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-13 07:56:51 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-13 07:56:51 +0000 |
| commit | 84bea6494e10b81f93b9d51bb38de40623da99ac (patch) | |
| tree | b1bd91b9abc61bf9aba8f3e62d110700a7e21e80 /dev-lang | |
| parent | Fix 64bit elf detection when cross-compiling. (diff) | |
| download | gentoo-2-84bea6494e10b81f93b9d51bb38de40623da99ac.tar.gz gentoo-2-84bea6494e10b81f93b9d51bb38de40623da99ac.tar.bz2 gentoo-2-84bea6494e10b81f93b9d51bb38de40623da99ac.zip | |
Fix from upstream for building without threads.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/python/files/python-2.4.2-no-threads.patch | 24 | ||||
| -rw-r--r-- | dev-lang/python/python-2.4.2.ebuild | 7 |
3 files changed, 35 insertions, 4 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 8aa273371131..6af19ffb33c5 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/python -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.184 2005/11/24 18:22:12 corsair Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.185 2006/01/13 07:56:51 vapier Exp $ + + 13 Jan 2006; Mike Frysinger <vapier@gentoo.org> + +files/python-2.4.2-no-threads.patch, python-2.4.2.ebuild: + Fix from upstream for building without threads. 24 Nov 2005; Markus Rothe <corsair@gentoo.org> python-2.4.2.ebuild: Stable on ppc64 diff --git a/dev-lang/python/files/python-2.4.2-no-threads.patch b/dev-lang/python/files/python-2.4.2-no-threads.patch new file mode 100644 index 000000000000..21bfb24c585d --- /dev/null +++ b/dev-lang/python/files/python-2.4.2-no-threads.patch @@ -0,0 +1,24 @@ +Fix from upstream svn + +--- python/trunk/Python/pystate.c 2005/06/20 16:52:57 39044 ++++ python/trunk/Python/pystate.c 2005/09/30 08:20:24 39634 +@@ -53,7 +53,9 @@ + PyThreadState *_PyThreadState_Current = NULL; + PyThreadFrameGetter _PyThreadState_GetFrame = NULL; + ++#ifdef WITH_THREAD + static void _PyGILState_NoteThreadState(PyThreadState* tstate); ++#endif + + + PyInterpreterState * +@@ -188,7 +190,9 @@ + tstate->c_profileobj = NULL; + tstate->c_traceobj = NULL; + ++#ifdef WITH_THREAD + _PyGILState_NoteThreadState(tstate); ++#endif + + HEAD_LOCK(); + tstate->next = interp->tstate_head; diff --git a/dev-lang/python/python-2.4.2.ebuild b/dev-lang/python/python-2.4.2.ebuild index 93696c318624..4e10bafac807 100644 --- a/dev-lang/python/python-2.4.2.ebuild +++ b/dev-lang/python/python-2.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.14 2005/11/24 18:22:12 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2.ebuild,v 1.15 2006/01/13 07:56:51 vapier Exp $ # NOTE about python-portage interactions : # - Do not add a pkg_setup() check for a certain version of portage @@ -59,6 +59,9 @@ src_unpack() { # db4.2 support epatch ${FILESDIR}/${PN}-2.4.1-db4.patch + # Upstream fix when building w/out thread support + epatch ${FILESDIR}/${P}-no-threads.patch + # adds support for PYTHON_DONTCOMPILE shell environment to # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) epatch ${FILESDIR}/${PN}-${PYVER}-gentoo_py_dontcompile.patch |