diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2015-08-30 11:36:24 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-08-30 11:36:24 -0400 |
| commit | 96907bfdfec76098d7b12ec6eabbdecb65dd29f0 (patch) | |
| tree | c53286603f1254d232ce5e1e9e503303b4ec230b | |
| parent | sys-devel/gcc: stabilize 4.8.5 ahead of tree. (diff) | |
| download | musl-96907bfd.tar.gz musl-96907bfd.tar.bz2 musl-96907bfd.zip | |
toolchain.eclass: sync to the tree version.
| -rw-r--r-- | eclass/toolchain.eclass | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index f4e651c5..44e08af6 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.675 2015/06/01 16:05:43 vapier Exp $ +# $Id$ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -152,7 +152,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then # the older versions, we don't want to bother supporting it. #448024 tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize ) tc_version_is_at_least 4.9 && IUSE+=" cilk" - tc_version_is_at_least 6.0 && IUSE+=" pie" + tc_version_is_at_least 6.0 && IUSE+=" pie +ssp" fi IUSE+=" ${IUSE_DEF[*]/#/+}" @@ -172,7 +172,7 @@ RDEPEND="sys-libs/zlib tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" if tc_version_is_at_least 4 ; then - GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2" + GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0" if tc_version_is_at_least 4.3 ; then RDEPEND+=" ${GMP_MPFR_DEPS}" elif in_iuse fortran ; then @@ -180,7 +180,7 @@ if tc_version_is_at_least 4 ; then fi fi -tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1" +tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0" if in_iuse graphite ; then if tc_version_is_at_least 5.0 ; then @@ -213,10 +213,6 @@ if in_iuse gcj ; then x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig - amd64? ( multilib? ( - app-emulation/emul-linux-x86-gtklibs - app-emulation/emul-linux-x86-xlibs - ) ) " tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango" tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip" @@ -882,7 +878,9 @@ toolchain_src_configure() { # Use the default ("release") checking because upstream usually neglects # to test "disabled" so it has a history of breaking. #317217 if tc_version_is_at_least 3.4 ; then - confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes release)}" ) + # The "release" keyword is new to 4.0. #551636 + local off=$(tc_version_is_at_least 4.0 && echo release || echo no) + confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes ${off})}" ) fi # Branding @@ -1195,7 +1193,11 @@ toolchain_src_configure() { fi if tc_version_is_at_least 6.0 ; then - confgcc+=( $(use_enable pie default-pie) ) + confgcc+=( + $(use_enable pie default-pie) + # This defaults to -fstack-protector-strong. + $(use_enable ssp default-ssp) + ) fi # Disable gcc info regeneration -- it ships with generated info pages |