commit: 24d4a557cba289327b67b0d339e04995cc293020 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Aug 8 21:22:50 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Aug 8 21:26:31 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=24d4a557
bin/phase-functions.sh: Filter SYSROOT unconditionally It is propagated in every EAPI because it was used unofficially before EAPI 7. Bug: https://bugs.gentoo.org/661006 Closes: https://github.com/gentoo/portage/pull/356 bin/phase-functions.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 1f9faaa41..51b480bfb 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -100,12 +100,13 @@ __filter_readonly_variables() { filtered_vars="$readonly_bash_vars $bash_misc_vars $PORTAGE_READONLY_VARS $misc_garbage_vars" + # Filter SYSROOT unconditionally. It is propagated in every EAPI + # because it was used unofficially before EAPI 7. See bug #661006. + filtered_vars+=" SYSROOT" + if ___eapi_has_BROOT; then filtered_vars+=" BROOT" fi - if ___eapi_has_SYSROOT; then - filtered_vars+=" SYSROOT" - fi # Don't filter/interfere with prefix variables unless they are # supported by the current EAPI. if ___eapi_has_prefix_variables; then
