[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass

[Michal Gorny (mgorny)]

mgorny      13/03/02 18:18:13

  Modified:             ChangeLog multilib-build.eclass
  Log:
  Improve the no-multilib fallback to respect ${ABI} set by multilib-portage.

Revision  Changes    Path
1.700                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.700&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.700&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.699&r2=1.700

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.699
retrieving revision 1.700
diff -u -r1.699 -r1.700
--- ChangeLog	2 Mar 2013 12:54:31 -0000	1.699
+++ ChangeLog	2 Mar 2013 18:18:13 -0000	1.700
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.699 2013/03/02 12:54:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.700 2013/03/02 18:18:13 mgorny Exp $
+
+  02 Mar 2013; Michał Górny <mgorny@g.o> multilib-build.eclass:
+  Improve the no-multilib fallback to respect ${ABI} set by multilib-portage.
 
   02 Mar 2013; Michał Górny <mgorny@g.o> python.eclass:
   Remove deprecation warnings wrt bug #452160. The code will not be removed



1.7                  eclass/multilib-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.6&r2=1.7

Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- multilib-build.eclass	27 Feb 2013 23:23:11 -0000	1.6
+++ multilib-build.eclass	2 Mar 2013 18:18:13 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.6 2013/02/27 23:23:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.7 2013/03/02 18:18:13 mgorny Exp $
 
 # @ECLASS: multilib-build.eclass
 # @MAINTAINER:
@@ -81,8 +81,13 @@
 	done
 
 	if [[ ! ${found} ]]; then
-		debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${DEFAULT_ABI}"
-		echo ${DEFAULT_ABI}
+		# ${ABI} can be used to override the fallback (multilib-portage),
+		# ${DEFAULT_ABI} is the safe fallback.
+		local abi=${ABI:-${DEFAULT_ABI}}
+
+		debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}"
+		debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}"
+		echo ${abi}
 	fi
 }
 
@@ -98,8 +103,9 @@
 multilib_foreach_abi() {
 	local initial_dir=${BUILD_DIR:-${S}}
 
+	local abis=( $(multilib_get_enabled_abis) )
 	local ABI
-	for ABI in $(multilib_get_enabled_abis); do
+	for ABI in "${abis[@]}"; do
 		multilib_toolchain_setup "${ABI}"
 		BUILD_DIR=${initial_dir%%/}-${ABI} "${@}"
 	done
@@ -122,8 +128,9 @@
 
 	multijob_init
 
+	local abis=( $(multilib_get_enabled_abis) )
 	local ABI
-	for ABI in $(multilib_get_enabled_abis); do
+	for ABI in "${abis[@]}"; do
 		(
 			multijob_child_init