Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass
Date: Mon, 27 Aug 2012 15:04:25
Message-Id: 20120827150409.2112020916@flycatcher.gentoo.org
1 vapier 12/08/27 15:04:09
2
3 Modified: multilib.eclass
4 Log:
5 add local to a few missing vars
6
7 Revision Changes Path
8 1.100 eclass/multilib.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.100&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.100&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.99&r2=1.100
13
14 Index: multilib.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
17 retrieving revision 1.99
18 retrieving revision 1.100
19 diff -u -r1.99 -r1.100
20 --- multilib.eclass 22 Aug 2012 16:03:08 -0000 1.99
21 +++ multilib.eclass 27 Aug 2012 15:04:08 -0000 1.100
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2011 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.99 2012/08/22 16:03:08 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.100 2012/08/27 15:04:08 vapier Exp $
27
28 # @ECLASS: multilib.eclass
29 # @MAINTAINER:
30 @@ -121,7 +121,7 @@
31 # Return a list of the ABIs we want to install for with
32 # the last one in the list being the default.
33 get_install_abis() {
34 - local order=""
35 + local x order=""
36
37 if [[ -z ${MULTILIB_ABIS} ]] ; then
38 echo "default"
39 @@ -162,7 +162,7 @@
40 # Return a list of the ABIs supported by this profile.
41 # the last one in the list being the default.
42 get_all_abis() {
43 - local order="" mvar dvar
44 + local x order="" mvar dvar
45
46 mvar="MULTILIB_ABIS"
47 dvar="DEFAULT_ABI"
48 @@ -193,9 +193,7 @@
49 # those that might not be touched by the current ebuild and always includes
50 # "lib".
51 get_all_libdirs() {
52 - local libdirs
53 - local abi
54 - local dir
55 + local libdirs abi
56
57 for abi in ${MULTILIB_ABIS}; do
58 libdirs+=" $(get_abi_LIBDIR ${abi})"