diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-08 09:46:55 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-08 09:46:55 -0800 |
| commit | 3bd94dbffd4cf338de8cc786f60525b0a84d2562 (patch) | |
| tree | 97dfe70a2b0ab376b22c8bf40cb547beced0bfc4 /bin/phase-functions.sh | |
| parent | c281c323adf14ece439b98dcf35531666266a0a5 (diff) | |
| download | portage-3bd94dbffd4cf338de8cc786f60525b0a84d2562.tar.gz portage-3bd94dbffd4cf338de8cc786f60525b0a84d2562.tar.bz2 portage-3bd94dbffd4cf338de8cc786f60525b0a84d2562.zip | |
Support FEATURES=force-prefix.
This adjusts the logic from commit
ff52f9dc31004becb8022e6437088d01917f413c to use FEATURES=force-prefix
instead of USE=prefix. This has the advantage that we don't have to
make any assumptions about the USE=prefix.
Diffstat (limited to 'bin/phase-functions.sh')
| -rw-r--r-- | bin/phase-functions.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 230291065..b19424291 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -96,7 +96,7 @@ filter_readonly_variables() { # supported by the current EAPI. case "${EAPI:-0}" in 0|1|2) - [[ " ${USE} " == *" prefix "* ]] && \ + [[ " ${FEATURES} " == *" force-prefix "* ]] && \ filtered_vars+=" ED EPREFIX EROOT" ;; *) @@ -502,7 +502,7 @@ dyn_install() { ebuild_phase pre_src_install _x=${ED} - [[ " ${USE} " == *" prefix "* ]] || \ + [[ " ${FEATURES} " == *" force-prefix "* ]] || \ case "$EAPI" in 0|1|2) _x=${D} ;; esac rm -rf "${D}" mkdir -p "${_x}" @@ -564,7 +564,7 @@ dyn_install() { # work in a different EPREFIX from the one is was built for. case "${EAPI:-0}" in 0|1|2) - [[ " ${USE} " == *" prefix "* ]] && \ + [[ " ${FEATURES} " == *" force-prefix "* ]] && \ [ -n "${EPREFIX}" ] && echo "${EPREFIX}" > EPREFIX ;; *) |