Attachment #570716 for bug #658572




	local WHITELIST=" /usr/bin/env "
	# shebang can be an absolutised path, bug #342929
	local eprefix=$(canonicalize ${EPREFIX})
	# Without USE=prefix-stack, tests using BPREFIX are
	# redundant to EPREFIX, but run only if we will fail.
	# Otherways, BPREFIX really is BROOT (the EAPI 7 one).
	local BPREFIX=${EPREFIX}
	local bprefix=${eprefix}
	if has prefix-stack ${USE} ; then
	   [[ -z ${ROOT%/} ]]             &&
	   [[ ${CBUILD} == ${CHOST} ]]    &&
	   [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
	:; then
		BPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}
		bprefix=$(canonicalize ${BPREFIX})
	fi




			fi ;;
	esac

	# PREFIX LOCAL: prefix-stack feature
	if ___eapi_has_prefix_variables         &&
	   has "${root_arg}" '--host-root' '-b' &&
	   has prefix-stack ${USE}              &&
	   [[ -z ${ROOT%/} ]]                   &&
	   [[ ${CBUILD} == ${CHOST} ]]          &&
	   [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
	:; then
		# When we merge into "stacked" EPREFIX, but not into some ROOT, build
		# tools found in EPREFIX perfectly work for current build environment.
		# perfectly work for the current build environment.
		# In a "stacked prefix" we explicitly utilize this situation.
		"${FUNCNAME[1]}" "${atom}" && return 0
	fi
	# END PREFIX LOCAL

Lines 207-213 SUPPORTED_FEATURES = frozenset([ Link Here

(-)a/lib/portage/const.py (-2 lines)
207	"splitdebug",	207	"splitdebug",
208	"split-elog",	208	"split-elog",
209	"split-log",	209	"split-log",
210	"stacked-prefix", # PREFIX LOCAL
211	"strict",	210	"strict",
212	"strict-keepdir",	211	"strict-keepdir",
213	"stricter",	212	"stricter",
214	-

Return to bug 658572

Lines 36-51 install_qa_check_prefix() { Link Here

(-)a/bin/install-qa-check.d/05prefix (-7 / +3 lines)
36	local WHITELIST=" /usr/bin/env "	36	local WHITELIST=" /usr/bin/env "
37	# shebang can be an absolutised path, bug #342929	37	# shebang can be an absolutised path, bug #342929
38	local eprefix=$(canonicalize ${EPREFIX})	38	local eprefix=$(canonicalize ${EPREFIX})
39	# Without the stacked-prefix feature, tests using BPREFIX	39	# Without USE=prefix-stack, tests using BPREFIX are
40	# are redundant to EPREFIX, but run only if we will fail.	40	# redundant to EPREFIX, but run only if we will fail.
41	# Otherways, BPREFIX really is BROOT (the EAPI 7 one).	41	# Otherways, BPREFIX really is BROOT (the EAPI 7 one).
42	local BPREFIX=${EPREFIX}	42	local BPREFIX=${EPREFIX}
43	local bprefix=${eprefix}	43	local bprefix=${eprefix}
44	if has stacked-prefix ${FEATURES} &&	44	if has prefix-stack ${USE} ; then
45	[[ -z ${ROOT%/} ]] &&
46	[[ ${CBUILD} == ${CHOST} ]] &&
47	[[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
48	:; then
49	BPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}	45	BPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}
50	bprefix=$(canonicalize ${BPREFIX})	46	bprefix=$(canonicalize ${BPREFIX})
51	fi	47	fi

Lines 932-949 ___best_version_and_has_version_common() { Link Here

(-)a/bin/phase-helpers.sh (-8 / +4 lines)
932	fi ;;	932	fi ;;
933	esac	933	esac
934		934
935	# PREFIX LOCAL: stacked-prefix feature	935	# PREFIX LOCAL: prefix-stack feature
936	if ___eapi_has_prefix_variables &&	936	if ___eapi_has_prefix_variables &&
937	has "${root_arg}" '--host-root' '-b' &&	937	has "${root_arg}" '--host-root' '-b' &&
938	has stacked-prefix ${FEATURES} &&	938	has prefix-stack ${USE} &&
939	[[ -z ${ROOT%/} ]] &&	939	[[ -z ${ROOT%/} ]] &&
940	[[ ${CBUILD} == ${CHOST} ]] &&
941	[[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
942	:; then	940	:; then
943	# When we merge into another EPREFIX, but not into some ROOT,	941	# When we merge into "stacked" EPREFIX, but not into some ROOT, build
944	# and CHOST is equal to CBUILD, build tools found in EPREFIX	942	# tools found in EPREFIX perfectly work for current build environment.
945	# perfectly work for the current build environment.
946	# In a "stacked prefix" we explicitly utilize this situation.
947	"${FUNCNAME[1]}" "${atom}" && return 0	943	"${FUNCNAME[1]}" "${atom}" && return 0
948	fi	944	fi
949	# END PREFIX LOCAL	945	# END PREFIX LOCAL