diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-07 22:22:31 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-07 22:22:31 -0800 |
| commit | ff52f9dc31004becb8022e6437088d01917f413c (patch) | |
| tree | 0f333c6bf4c09f751d993ef843089f8b5c80ef2e /bin/phase-functions.sh | |
| parent | c93a46851c43f7e8539a67b2376dc8f55af41789 (diff) | |
| download | portage-ff52f9dc31004becb8022e6437088d01917f413c.tar.gz portage-ff52f9dc31004becb8022e6437088d01917f413c.tar.bz2 portage-ff52f9dc31004becb8022e6437088d01917f413c.zip | |
Make USE=prefix enable EPREFIX in all EAPIs.
This is safe because the prefix flag should be masked in all non-prefix
profiles, and older EAPIs would otherwise be useless with prefix
configurations. This brings compatibility with the prefix branch of
portage, which also supports EPREFIX for all EAPIs (for obvious
reasons).
Diffstat (limited to 'bin/phase-functions.sh')
| -rw-r--r-- | bin/phase-functions.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index f46368d68..351ae9e1d 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -96,6 +96,8 @@ filter_readonly_variables() { # supported by the current EAPI. case "${EAPI:-0}" in 0|1|2) + [[ " ${USE} " == *" prefix "* ]] && \ + filtered_vars+=" ED EPREFIX EROOT" ;; *) filtered_vars+=" ED EPREFIX EROOT" @@ -500,7 +502,8 @@ dyn_install() { ebuild_phase pre_src_install _x=${ED} - case "$EAPI" in 0|1|2) _x=${D} ;; esac + [[ " ${USE} " == *" prefix "* ]] || \ + case "$EAPI" in 0|1|2) _x=${D} ;; esac rm -rf "${D}" mkdir -p "${_x}" unset _x |