diff options
author | Michał Górny <mgorny@gentoo.org> | 2013-10-10 06:10:00 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2013-10-10 06:10:00 +0000 |
commit | 11bd344605115899a952f98d901974e346403611 (patch) | |
tree | 3fec1c3152181e7573cb9608921236c5424e9a16 /eclass | |
parent | Actually add 4.4.11.1 this time. (diff) | |
download | gentoo-2-11bd344605115899a952f98d901974e346403611.tar.gz gentoo-2-11bd344605115899a952f98d901974e346403611.tar.bz2 gentoo-2-11bd344605115899a952f98d901974e346403611.zip |
Do not alter HOME and TMPDIR when single impl is being used. This may work-around bug #487260.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 6 | ||||
-rw-r--r-- | eclass/distutils-r1.eclass | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8cc179278977..e477b72254eb 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1017 2013/10/09 19:08:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1018 2013/10/10 06:10:00 mgorny Exp $ + + 10 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Do not alter HOME and TMPDIR when single impl is being used. This may + work-around bug #487260. 09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Fix pypy dependency. diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 4947eedcb624..acc791b93b3e 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.86 2013/09/28 19:11:05 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.87 2013/10/10 06:10:00 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -544,10 +544,12 @@ distutils-r1_run_phase() { fi local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" - local -x TMPDIR=${T}/${EPYTHON} - local -x HOME=${TMPDIR}/home + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + local -x TMPDIR=${T}/${EPYTHON} + local -x HOME=${TMPDIR}/home - mkdir -p "${TMPDIR}" "${HOME}" || die + mkdir -p "${TMPDIR}" "${HOME}" || die + fi "${@}" |