[patch] Suggested implementation for sys-apps/portage

0001-Implement-7-multiarch-EAPI.patch (text/plain), 3.22 KB, created by Samuel Holland on 2019-01-22 01:36:01 UTC

From 68e0b0253b8618717fb33b13bf23b02eaab75239 Mon Sep 17 00:00:00 2001
From: Samuel Holland <[e-mail]>
Date: Mon, 21 Jan 2019 19:34:31 -0600
Subject: [PATCH] Implement 7-multiarch EAPI

Signed-off-by: Samuel Holland <[e-mail]>
---
 bin/eapi.sh          |  8 ++++++++
 bin/phase-helpers.sh | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/bin/eapi.sh b/bin/eapi.sh
index 455bc9b0d..d3ada941a 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -152,6 +152,10 @@ ___eapi_has_package_manager_build_group() {
 	[[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
 }
 
+___eapi_has_get_incdir() {
+	[[ ${1-${EAPI-0}} =~ ^(7-multiarch)$ ]]
+}
+
 # HELPERS BEHAVIOR
 
 ___eapi_best_version_and_has_version_support_--host-root() {
@@ -186,6 +190,10 @@ ___eapi_econf_passes_--with-sysroot() {
 	[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
 }
 
+___eapi_econf_passes_--includedir() {
+	[[ ${1-${EAPI-0}} =~ ^(7-multiarch)$ ]]
+}
+
 ___eapi_use_enable_and_use_with_support_empty_third_argument() {
 	[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]]
 }
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index ba3f27930..143f6c239 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -640,7 +640,7 @@ econf() {
 		fi
 
 		local conf_args=()
-		if ___eapi_econf_passes_--disable-dependency-tracking || ___eapi_econf_passes_--disable-silent-rules || ___eapi_econf_passes_--docdir_and_--htmldir || ___eapi_econf_passes_--with-sysroot; then
+		if ___eapi_econf_passes_--disable-dependency-tracking || ___eapi_econf_passes_--disable-silent-rules || ___eapi_econf_passes_--docdir_and_--htmldir || ___eapi_econf_passes_--with-sysroot || ___eapi_econf_passes_--includedir; then
 			local conf_help=$("${ECONF_SOURCE}/configure" --help 2>/dev/null)
 
 			if ___eapi_econf_passes_--disable-dependency-tracking; then
@@ -670,6 +670,25 @@ econf() {
 					conf_args+=( --with-sysroot="${ESYSROOT:-/}" )
 				fi
 			fi
+
+			if ___eapi_econf_passes_--includedir; then
+				# if the ebuild passes in --includedir, they're responsible for the conf_incdir fun.
+				local CONF_INCDIR INCDIR_VAR="INCDIR_${ABI}"
+				if [[ -n ${ABI} && -n ${!INCDIR_VAR} ]] ; then
+					CONF_INCDIR=${!INCDIR_VAR}
+				fi
+				if [[ -n ${CONF_INCDIR} ]] && ! __hasgq --includedir=\* "$@" ; then
+					export CONF_PREFIX=$(__hasg --exec-prefix=\* "$@")
+					[[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(__hasg --prefix=\* "$@")
+					: ${CONF_PREFIX:=${EPREFIX}/usr}
+					CONF_PREFIX=${CONF_PREFIX#*=}
+					[[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}"
+					[[ ${CONF_INCDIR} != /* ]] && CONF_INCDIR="/${CONF_INCDIR}"
+					conf_args+=(
+						--includedir="$(__strip_duplicate_slashes "${CONF_PREFIX}${CONF_INCDIR}")"
+					)
+				fi
+			fi
 		fi
 
 		# if the profile defines a location to install libs to aside from default, pass it on.
@@ -976,6 +995,17 @@ best_version() {
 	___best_version_and_has_version_common "$@"
 }
 
+if ___eapi_has_get_incdir; then
+	get_incdir() {
+		local incdir_var="INCDIR_${ABI}"
+		local incdir="include"
+
+		[[ -n ${ABI} && -n ${!incdir_var} ]] && incdir=${!incdir_var}
+
+		echo "${incdir}"
+	}
+fi
+
 if ___eapi_has_get_libdir; then
 	get_libdir() {
 		local libdir_var="LIBDIR_${ABI}"
-- 
2.19.2