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: toolchain.eclass
Date: Sun, 29 Mar 2015 18:30:40
Message-Id: 20150329183035.52C4514CAD@oystercatcher.gentoo.org
1 vapier 15/03/29 18:30:34
2
3 Modified: toolchain.eclass
4 Log:
5 put each alpha release into its own SLOT
6
7 Revision Changes Path
8 1.659 eclass/toolchain.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.659&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.659&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.658&r2=1.659
13
14 Index: toolchain.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17 retrieving revision 1.658
18 retrieving revision 1.659
19 diff -u -r1.658 -r1.659
20 --- toolchain.eclass 29 Mar 2015 06:15:31 -0000 1.658
21 +++ toolchain.eclass 29 Mar 2015 18:30:34 -0000 1.659
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2015 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.658 2015/03/29 06:15:31 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.659 2015/03/29 18:30:34 vapier Exp $
27
28 # Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30 @@ -157,7 +157,7 @@
31 IUSE+=" ${IUSE_DEF[*]}"
32
33 # Support upgrade paths here or people get pissed
34 -if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot ; then
35 +if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
36 SLOT="${GCC_CONFIG_VER}"
37 else
38 SLOT="${GCC_BRANCH_VER}"