[patch] 'stacked-prefix' feature, patch draft

0001-introduce-the-stacked-prefix-FEATURE.patch (text/plain), 2.02 KB, created by Michael Haubenwallner (RETIRED) on 2018-06-20 14:36:12 UTC

From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <[e-mail]>
Date: Tue, 19 Jun 2018 16:39:12 +0200
Subject: [PATCH] introduce the 'stacked-prefix' FEATURE

When we merge into another EPREFIX, but not into some ROOT,
and CHOST is equal to CBUILD, build tools found in EPREFIX
perfectly work for the current build environment.
In a "stacked prefix" we explicitly utilize this situation.

This is useful during prefix bootstrap (#655414, #655326), but also to
build packages for targets unable to support the full portage toolchain
(native Windows, MinGW), but otherwise do not require a full cross
compilation setup.
---
 bin/phase-helpers.sh | 14 ++++++++++++++
 pym/portage/const.py |  1 +
 2 files changed, 15 insertions(+)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index c32533fb3..fea2362cf 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() {
 			fi ;;
 	esac
 
+	if ___eapi_has_prefix_variables         &&
+	   has "${root_arg}" '--host-root' '-b' &&
+	   has stacked-prefix ${FEATURES}       &&
+	   [[ -z ${ROOT%/} ]]                   &&
+	   [[ ${CBUILD} == ${CHOST} ]]          &&
+	   [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] &&
+	:; then
+		# When we merge into another EPREFIX, but not into some ROOT,
+		# and CHOST is equal to CBUILD, build tools found in EPREFIX
+		# perfectly work for the current build environment.
+		# In a "stacked prefix" we explicitly utilize this situation.
+		"${FUNCNAME[1]}" "${atom}" && return 0
+	fi
+
 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
 		cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" "${root}" "${atom}")
 	else
diff --git a/pym/portage/const.py b/pym/portage/const.py
index a3d927c3b..ed54425b5 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -204,6 +204,7 @@ SUPPORTED_FEATURES       = frozenset([
 	"splitdebug",
 	"split-elog",
 	"split-log",
+	"stacked-prefix",
 	"strict",
 	"strict-keepdir",
 	"stricter",
-- 
2.16.1