[gentoo-dev] [PATCH 1/2] Order ABIs following MULTILIB_ABIS.

[Michał Górny]

This ensures that profile order is preserved.
---
 gx86/eclass/multilib-build.eclass | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gx86/eclass/multilib-build.eclass b/gx86/eclass/multilib-build.eclass
index a6104e0..96bf26f 100644
--- a/gx86/eclass/multilib-build.eclass
+++ b/gx86/eclass/multilib-build.eclass
@@ -64,16 +64,19 @@ _multilib_build_set_globals
 multilib_get_enabled_abis() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local supported_abis=$(get_all_abis)
-	local i found
-	for i in "${_MULTILIB_FLAGS[@]}"; do
-		local abi=${i#*:}
-		local flag=${i%:*}
-
-		if has "${abi}" ${supported_abis} && use "${flag}"; then
-			echo "${abi}"
-			found=1
-		fi
+	local abis=( $(get_all_abis) )
+
+	local abi i found
+	for abi in "${abis[@]}"; do
+		for i in "${_MULTILIB_FLAGS[@]}"; do
+			local m_abi=${i#*:}
+			local m_flag=${i%:*}
+
+			if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
+				echo "${abi}"
+				found=1
+			fi
+		done
 	done
 
 	if [[ ! ${found} ]]; then
-- 
1.8.1.1