diff options
| author |   Dirkjan Ochtman <djc@gentoo.org> | 2011-12-13 18:10:36 +0000 |
|---|---|---|
| committer | Dirkjan Ochtman <djc@gentoo.org> | 2011-12-13 18:10:36 +0000 |
| commit | c19891c49df95465c268bde0e53802abfca11aeb (patch) | |
| tree | 123ddc8da5fb7c399d69e03d5238bf89ddd3d24d | |
| parent | Remove || dir on emake (diff) | |
| download | gentoo-2-c19891c49df95465c268bde0e53802abfca11aeb.tar.gz gentoo-2-c19891c49df95465c268bde0e53802abfca11aeb.tar.bz2 gentoo-2-c19891c49df95465c268bde0e53802abfca11aeb.zip | |
Commit a fix for bug 394547.
(Portage version: 2.1.10.39/cvs/Linux x86_64)
| -rw-r--r-- | dev-lang/python/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/python/files/linux2.patch | 11 |
2 files changed, 4 insertions, 12 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 10f1a63c8b2b..808c78e64072 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/python # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.561 2011/12/09 03:10:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.562 2011/12/13 18:10:35 djc Exp $ + + 13 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> files/linux2.patch: + Prune back linux2.patch to prevent race conditions (bug 394547). 09 Dec 2011; Mike Frysinger <vapier@gentoo.org> python-3.2.2.ebuild: Replace hardcoded /lib64 searching with /<abi_libdir> paths. diff --git a/dev-lang/python/files/linux2.patch b/dev-lang/python/files/linux2.patch index c34142381878..b002dc3392b2 100644 --- a/dev-lang/python/files/linux2.patch +++ b/dev-lang/python/files/linux2.patch @@ -1,15 +1,4 @@ http://hg.python.org/cpython/rev/c816479f6aaf/ -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -2995,6 +2995,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux*) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in |