| 1 |
commit: 96907bfdfec76098d7b12ec6eabbdecb65dd29f0 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 15:36:24 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 15:36:24 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=96907bfd |
| 7 |
|
| 8 |
toolchain.eclass: sync to the tree version. |
| 9 |
|
| 10 |
eclass/toolchain.eclass | 22 ++++++++++++---------- |
| 11 |
1 file changed, 12 insertions(+), 10 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 14 |
index f4e651c..44e08af 100644 |
| 15 |
--- a/eclass/toolchain.eclass |
| 16 |
+++ b/eclass/toolchain.eclass |
| 17 |
@@ -1,6 +1,6 @@ |
| 18 |
# Copyright 1999-2015 Gentoo Foundation |
| 19 |
# Distributed under the terms of the GNU General Public License v2 |
| 20 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.675 2015/06/01 16:05:43 vapier Exp $ |
| 21 |
+# $Id$ |
| 22 |
|
| 23 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 24 |
|
| 25 |
@@ -152,7 +152,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then |
| 26 |
# the older versions, we don't want to bother supporting it. #448024 |
| 27 |
tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize ) |
| 28 |
tc_version_is_at_least 4.9 && IUSE+=" cilk" |
| 29 |
- tc_version_is_at_least 6.0 && IUSE+=" pie" |
| 30 |
+ tc_version_is_at_least 6.0 && IUSE+=" pie +ssp" |
| 31 |
fi |
| 32 |
|
| 33 |
IUSE+=" ${IUSE_DEF[*]/#/+}" |
| 34 |
@@ -172,7 +172,7 @@ RDEPEND="sys-libs/zlib |
| 35 |
tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" |
| 36 |
|
| 37 |
if tc_version_is_at_least 4 ; then |
| 38 |
- GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2" |
| 39 |
+ GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0" |
| 40 |
if tc_version_is_at_least 4.3 ; then |
| 41 |
RDEPEND+=" ${GMP_MPFR_DEPS}" |
| 42 |
elif in_iuse fortran ; then |
| 43 |
@@ -180,7 +180,7 @@ if tc_version_is_at_least 4 ; then |
| 44 |
fi |
| 45 |
fi |
| 46 |
|
| 47 |
-tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1" |
| 48 |
+tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0" |
| 49 |
|
| 50 |
if in_iuse graphite ; then |
| 51 |
if tc_version_is_at_least 5.0 ; then |
| 52 |
@@ -213,10 +213,6 @@ if in_iuse gcj ; then |
| 53 |
x11-proto/xextproto |
| 54 |
=x11-libs/gtk+-2* |
| 55 |
virtual/pkgconfig |
| 56 |
- amd64? ( multilib? ( |
| 57 |
- app-emulation/emul-linux-x86-gtklibs |
| 58 |
- app-emulation/emul-linux-x86-xlibs |
| 59 |
- ) ) |
| 60 |
" |
| 61 |
tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango" |
| 62 |
tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip" |
| 63 |
@@ -882,7 +878,9 @@ toolchain_src_configure() { |
| 64 |
# Use the default ("release") checking because upstream usually neglects |
| 65 |
# to test "disabled" so it has a history of breaking. #317217 |
| 66 |
if tc_version_is_at_least 3.4 ; then |
| 67 |
- confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes release)}" ) |
| 68 |
+ # The "release" keyword is new to 4.0. #551636 |
| 69 |
+ local off=$(tc_version_is_at_least 4.0 && echo release || echo no) |
| 70 |
+ confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes ${off})}" ) |
| 71 |
fi |
| 72 |
|
| 73 |
# Branding |
| 74 |
@@ -1195,7 +1193,11 @@ toolchain_src_configure() { |
| 75 |
fi |
| 76 |
|
| 77 |
if tc_version_is_at_least 6.0 ; then |
| 78 |
- confgcc+=( $(use_enable pie default-pie) ) |
| 79 |
+ confgcc+=( |
| 80 |
+ $(use_enable pie default-pie) |
| 81 |
+ # This defaults to -fstack-protector-strong. |
| 82 |
+ $(use_enable ssp default-ssp) |
| 83 |
+ ) |
| 84 |
fi |
| 85 |
|
| 86 |
# Disable gcc info regeneration -- it ships with generated info pages |
Archives