gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

toolchain.eclass: use versioned SLOT all the time

Browse Source
This commit is contained in:
Mike Frysinger
2016-03-12 10:53:42 -05:00
parent 024810c8aa
commit 6fd83c0c33
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eclass/toolchain.eclass
View File

@@ -159,15 +159,7 @@ fi
IUSE+=" ${IUSE_DEF[*]/#/+}"
# Support upgrade paths here or people get pissed
if ! tc_version_is_at_least 4.8 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
SLOT="${GCC_CONFIG_VER}"
elif ! tc_version_is_at_least 5.0 ; then
SLOT="${GCC_BRANCH_VER}"
else
# Upstream changed versioning w/gcc-5+, so SLOT matches major only. #555164
SLOT="${GCCMAJOR}"
fi
SLOT="${GCC_CONFIG_VER}"
#---->> DEPEND <<----

6
profiles/updates/1Q-2016
View File

@@ -35,3 +35,9 @@ move dev-perl/perl-tk dev-perl/Tk
move dev-perl/mogilefs-server dev-perl/MogileFS-Server
move dev-perl/ogg-vorbis-header dev-perl/Ogg-Vorbis-Header
move dev-perl/p5-Palm dev-perl/Palm
slotmove sys-devel/gcc 4.5 4.5.4
slotmove sys-devel/gcc 4.6 4.6.4
slotmove sys-devel/gcc 4.7 4.7.4
slotmove sys-devel/gcc 4.8 4.8.5
slotmove sys-devel/gcc 4.9 4.9.3
slotmove sys-devel/gcc 5 5.3.0

1
sys-devel/gcc/gcc-4.9.3.ebuild
View File

@@ -27,6 +27,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
RDEPEND=""
DEPEND="${RDEPEND}
elibc_glibc? ( >=sys-libs/glibc-2.8 )
!multislot? ( !<${CATEGORY}/gcc-4.9 )
>=${CATEGORY}/binutils-2.20"
if [[ ${CATEGORY} != cross-* ]] ; then

1
sys-devel/gcc/gcc-5.3.0.ebuild
View File

@@ -27,6 +27,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
RDEPEND=""
DEPEND="${RDEPEND}
elibc_glibc? ( >=sys-libs/glibc-2.8 )
!multislot? ( !<${CATEGORY}/gcc-4.9 )
>=${CATEGORY}/binutils-2.20"
if [[ ${CATEGORY} != cross-* ]] ; then