summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2023-08-07 12:59:34 +0100
committerJames Le Cuirot <chewi@gentoo.org>2023-08-07 13:09:48 +0100
commit01e4a638c3decc74baa52975043bb4af89ae2c70 (patch)
tree0c38c8026bd25a103635f07d1b3967f6826a3288 /eclass
parentmedia-libs/nv-codec-headers: fix double prefix (diff)
downloadgentoo-01e4a638c3decc74baa52975043bb4af89ae2c70.tar.gz
gentoo-01e4a638c3decc74baa52975043bb4af89ae2c70.tar.bz2
gentoo-01e4a638c3decc74baa52975043bb4af89ae2c70.zip
Revert "python-utils-r1.eclass: Remove old EAPI hack for exporting PYTHON"
This reverts commit 9e4dc068a3066434bfbfa3a0f979ec5d6d8020eb. It fixed cross-prefix but inadvertently broke regular prefix. Both were ultimately affected by the same PMS + Portage bug where BROOT was not set in pkg_preinst. This has now been fixed, but regular prefix users need to be able to update Portage without hitting the issue. Cross-prefix users are safe because the BROOT Portage can be updated without hitting the issue. Closes: https://bugs.gentoo.org/911797 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/python-utils-r1.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 27157a003ab2..690b8ba8c79b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -338,7 +338,9 @@ _python_export() {
debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}"
;;
PYTHON)
- export PYTHON=${BROOT}/usr/bin/${impl}
+ # Under EAPI 7+, this should just use ${BROOT}, but Portage
+ # <3.0.50 was buggy, and prefix users need this to update.
+ export PYTHON=${BROOT-${EPREFIX}}/usr/bin/${impl}
debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
;;
PYTHON_SITEDIR)