diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-03-02 18:18:13 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-03-02 18:18:13 +0000 |
| commit | b70a50f9c794f59827b4326d0929a8df2d9f28b2 (patch) | |
| tree | 83dfb4e29df653a9a46c5465c1430f88dfccd2c6 /eclass | |
| parent | Fix bug 335159. Thanks Kevin Pyle and Michael Mair-Keimberger. Clean out cruft. (diff) | |
| download | historical-b70a50f9c794f59827b4326d0929a8df2d9f28b2.tar.gz historical-b70a50f9c794f59827b4326d0929a8df2d9f28b2.tar.bz2 historical-b70a50f9c794f59827b4326d0929a8df2d9f28b2.zip | |
Improve the no-multilib fallback to respect ${ABI} set by multilib-portage.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0cec392ddbe3..e72e30967ba2 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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@gentoo.org> multilib-build.eclass: + Improve the no-multilib fallback to respect ${ABI} set by multilib-portage. 02 Mar 2013; Michał Górny <mgorny@gentoo.org> python.eclass: Remove deprecation warnings wrt bug #452160. The code will not be removed diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index c1bcb257dccd..86a32e0fcc2b 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -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 @@ multilib_get_enabled_abis() { 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_get_enabled_abis() { 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 @@ multilib_parallel_foreach_abi() { 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 |