summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2019-03-25 12:36:26 +0100
committerMichael Haubenwallner <haubi@gentoo.org>2019-03-25 13:01:32 +0100
commit954efef84a53cdbd10393fd71a37bd9cc3286ac9 (patch)
tree916222fd24445ed13f68144664f87f2c684b946f
parentbootstrap-prefix.sh: set USE=prefix-stack (diff)
downloadprefix-954efef84a53cdbd10393fd71a37bd9cc3286ac9.tar.gz
prefix-954efef84a53cdbd10393fd71a37bd9cc3286ac9.tar.bz2
prefix-954efef84a53cdbd10393fd71a37bd9cc3286ac9.zip
python-utils-r1.eclass: support USE=prefix-stack
Need to support FEATURES=stacked-prefix for some transition period. Better not test with 'use prefix-stack' but 'has prefix-stack ${USE}', for when the user's profile does not set IUSE_IMPLICIT=prefix-stack yet. Bug: https://bugs.gentoo.org/658572 Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>
-rw-r--r--eclass/python-utils-r1.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d72329b30a..6e9cab5360 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -390,7 +390,7 @@ python_export() {
export PYTHON=${EPREFIX}/usr/bin/${impl}
if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \
&& [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \
- && has stacked-prefix ${FEATURES}; then
+ && { has prefix-stack ${USE} || has stacked-prefix ${FEATURES} ;} ; then
# Need to look in build prefix
if [[ -x ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl} ]]; then
PYTHON=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl}
@@ -402,7 +402,7 @@ python_export() {
export PYTHON_EPREFIX=${EPREFIX}
if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \
&& [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \
- && has stacked-prefix ${FEATURES}; then
+ && { has prefix-stack ${USE} || has stacked-prefix ${FEATURES} ;} ; then
# Need to look in build prefix
if [[ -x ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl} ]]; then
PYTHON_EPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}
@@ -521,7 +521,7 @@ python_export() {
export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/${impl}
if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \
&& [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \
- && has stacked-prefix ${FEATURES}; then
+ && { has prefix-stack ${USE} || has stacked-prefix ${FEATURES} ;} ; then
# Need to look in build prefix
if [[ -x ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl} ]]; then
PYTHON_SCRIPTDIR=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/lib/python-exec/${impl}