Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
Date: Tue, 01 Oct 2013 17:42:44
Message-Id: 20131001174238.CC8C42004C@flycatcher.gentoo.org
1 mgorny 13/10/01 17:42:38
2
3 Modified: ChangeLog multilib-build.eclass
4 Log:
5 Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
6
7 Revision Changes Path
8 1.1003 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1003&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1003&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1002&r2=1.1003
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1002
18 retrieving revision 1.1003
19 diff -u -r1.1002 -r1.1003
20 --- ChangeLog 30 Sep 2013 07:27:06 -0000 1.1002
21 +++ ChangeLog 1 Oct 2013 17:42:38 -0000 1.1003
22 @@ -1,6 +1,9 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1002 2013/09/30 07:27:06 mgorny Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1003 2013/10/01 17:42:38 mgorny Exp $
27 +
28 + 01 Oct 2013; Michał Górny <mgorny@g.o> multilib-build.eclass:
29 + Split ABIs without altering IFS, to work-around bug in Paludis, bug #486592.
30
31 30 Sep 2013; Michał Górny <mgorny@g.o> multilib-build.eclass:
32 Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch
33
34
35
36 1.22 eclass/multilib-build.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.22&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.22&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.21&r2=1.22
41
42 Index: multilib-build.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
45 retrieving revision 1.21
46 retrieving revision 1.22
47 diff -u -r1.21 -r1.22
48 --- multilib-build.eclass 30 Sep 2013 07:27:06 -0000 1.21
49 +++ multilib-build.eclass 1 Oct 2013 17:42:38 -0000 1.22
50 @@ -1,6 +1,6 @@
51 # Copyright 1999-2013 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.21 2013/09/30 07:27:06 mgorny Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.22 2013/10/01 17:42:38 mgorny Exp $
55
56 # @ECLASS: multilib-build.eclass
57 # @MAINTAINER:
58 @@ -72,14 +72,18 @@
59
60 local abis=( $(get_all_abis) )
61
62 - local IFS=,
63 local abi i found
64 for abi in "${abis[@]}"; do
65 for i in "${_MULTILIB_FLAGS[@]}"; do
66 local m_abis=${i#*:} m_abi
67 local m_flag=${i%:*}
68
69 - for m_abi in ${m_abis}; do
70 + # split on ,; we can't switch IFS for function scope because
71 + # paludis is broken (bug #486592), and switching it locally
72 + # for the split is more complex than tricking like this
73 + m_abis=( ${m_abis/,/ } )
74 +
75 + for m_abi in ${m_abis[@]}; do
76 if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
77 echo "${abi}"
78 found=1