diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-08 16:21:07 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-08 16:21:07 -0800 |
| commit | 75768ea8c922c0266829458025e4b2d35ff49804 (patch) | |
| tree | 00b37324920b51bd09e9554f9967b979d17e4c65 /bin/ebuild.sh | |
| parent | 62a402337c6d43c448ff0b5657ada26ff004d421 (diff) | |
| download | portage-75768ea8c922c0266829458025e4b2d35ff49804.tar.gz portage-75768ea8c922c0266829458025e4b2d35ff49804.tar.bz2 portage-75768ea8c922c0266829458025e4b2d35ff49804.zip | |
Include EPREFIX directories in PATH.
This relocates the PATH generation code from ebuild.sh to
doebuild_environment, which helps to eliminate duplicate code.
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 8ca7a4121..226b9f6e5 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -5,13 +5,6 @@ PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" -ROOTPATH=${ROOTPATH##:} -ROOTPATH=${ROOTPATH%%:} -PREROOTPATH=${PREROOTPATH##:} -PREROOTPATH=${PREROOTPATH%%:} -PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH -export PATH - # Prevent aliases from causing portage to act inappropriately. # Make sure it's before everything so we don't mess aliases that follow. unalias -a @@ -585,18 +578,6 @@ if ! has "$EBUILD_PHASE" clean cleanrm ; then if [[ $EBUILD_PHASE != depend ]] ; then - case "$EAPI" in - 0|1|2|3) - _ebuild_helpers_path="$PORTAGE_BIN_PATH/ebuild-helpers" - ;; - *) - _ebuild_helpers_path="$PORTAGE_BIN_PATH/ebuild-helpers/4:$PORTAGE_BIN_PATH/ebuild-helpers" - ;; - esac - - PATH=$_ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH - unset _ebuild_helpers_path - _eprefix=${EPREFIX} case "$EAPI" in 0|1|2) _eprefix= ;; esac # Use default ABI libdir in accordance with bug #355283. |