diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-11-04 08:04:00 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-11-04 08:04:00 +0000 |
| commit | 8b14412353af5f66b70ff2db7f69e3ba71336f9c (patch) | |
| tree | ec3aeedcc7075de5bfc0722fb2dd97705c1f97b5 /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-8b14412353af5f66b70ff2db7f69e3ba71336f9c.tar.gz gentoo-2-8b14412353af5f66b70ff2db7f69e3ba71336f9c.tar.bz2 gentoo-2-8b14412353af5f66b70ff2db7f69e3ba71336f9c.zip | |
Fix broken dependencies due to gcc multislotting, #528194, #528196
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 258f4efa283f..f3e5e3c57f2d 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1400 2014/11/02 00:45:43 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1401 2014/11/04 08:04:00 jlec Exp $ + + 04 Nov 2014; Justin Lecher <jlec@gentoo.org> toolchain.eclass: + Fix broken dependencies due to gcc multislotting, #528194, #528196 02 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-app.eclass: Remove handling of EAPI=0,1,2 since that codepath cannot run anymore anyway diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 28fc5028985d..9ac8fab83fe9 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.645 2014/11/02 21:30:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.646 2014/11/04 08:04:00 jlec Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -155,7 +155,7 @@ fi IUSE+=" ${IUSE_DEF[*]}" # Support upgrade paths here or people get pissed -if ! tc_version_is_at_least 4.7 || use multislot ; then +if use multislot ; then SLOT="${GCC_CONFIG_VER}" else SLOT="${GCC_BRANCH_VER}" |