diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-01 10:52:40 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-01 10:52:40 +0000 |
| commit | b7adeda57dd74f3a41946180f08e2ef26240d7e2 (patch) | |
| tree | 25be7f90b62b78e19a7fce13f73cf798ab11bf28 /eclass | |
| parent | Make distutils-r1_rename_scripts private. Rename all matching executables rec... (diff) | |
| download | historical-b7adeda57dd74f3a41946180f08e2ef26240d7e2.tar.gz historical-b7adeda57dd74f3a41946180f08e2ef26240d7e2.tar.bz2 historical-b7adeda57dd74f3a41946180f08e2ef26240d7e2.zip | |
Use intermediate-root install.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 08f14f92cf60..f0c2874e3650 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.534 2012/12/01 10:51:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.535 2012/12/01 10:52:40 mgorny Exp $ + + 01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Use intermediate-root install. 01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Make distutils-r1_rename_scripts private. Rename all matching executables diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 128dcc14a196..f0b250284313 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.21 2012/12/01 10:51:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.22 2012/12/01 10:52:40 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -297,9 +297,14 @@ distutils-r1_python_install() { local PYTHONDONTWRITEBYTECODE export PYTHONDONTWRITEBYTECODE - esetup.py install "${flags[@]}" --root="${D}" "${@}" + local root=${D}/_${EPYTHON} - _distutils-r1_rename_scripts "${D}" + esetup.py install "${flags[@]}" --root="${root}" "${@}" + _distutils-r1_rename_scripts "${root}" + + # merge + cp -a -l -n "${root}"/* "${D}"/ || die "Merging ${EPYTHON} image failed." + rm -rf "${root}" } # @FUNCTION: distutils-r1_python_install_all |