summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-10-01 17:42:38 +0000
committerMichał Górny <mgorny@gentoo.org>2013-10-01 17:42:38 +0000
commit3e067a6863359f9274b132f1086c8e870c1dce44 (patch)
treeb6ca9f335301f4e94dd4fe6963eea1703d3aba6e /eclass/multilib-build.eclass
parentfix for bug 486094 (diff)
downloadhistorical-3e067a6863359f9274b132f1086c8e870c1dce44.tar.gz
historical-3e067a6863359f9274b132f1086c8e870c1dce44.tar.bz2
historical-3e067a6863359f9274b132f1086c8e870c1dce44.zip
Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
Diffstat (limited to 'eclass/multilib-build.eclass')
-rw-r--r--eclass/multilib-build.eclass10
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 3d89cedf605b..140bea6d6097 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.21 2013/09/30 07:27:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.22 2013/10/01 17:42:38 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -72,14 +72,18 @@ multilib_get_enabled_abis() {
local abis=( $(get_all_abis) )
- local IFS=,
local abi i found
for abi in "${abis[@]}"; do
for i in "${_MULTILIB_FLAGS[@]}"; do
local m_abis=${i#*:} m_abi
local m_flag=${i%:*}
- for m_abi in ${m_abis}; do
+ # split on ,; we can't switch IFS for function scope because
+ # paludis is broken (bug #486592), and switching it locally
+ # for the split is more complex than tricking like this
+ m_abis=( ${m_abis/,/ } )
+
+ for m_abi in ${m_abis[@]}; do
if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
echo "${abi}"
found=1