[gentoo-commits] repo/gentoo:master commit in: eclass/

[Matthias Maier]

commit:     28ec20d517e494deed48497b1c478f5bd4dff1a6
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Jun 14 15:00:32 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 08:23:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ec20d5

toolchain-glibc.eclass: Always enable stack guard randomization (bug #621742).

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 eclass/toolchain-glibc.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index eba829cd2f6..d1e79975ccf 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -780,7 +780,6 @@ glibc_do_configure() {
        [[ -d ports ]] && addons+=",ports"
        popd > /dev/null
 
-       myconf+=( $(use_enable hardened stackguard-randomization) )
        if has_version '<sys-libs/glibc-2.13' ; then
                myconf+=( --enable-old-ssp-compat )
        fi
@@ -789,6 +788,12 @@ glibc_do_configure() {
                myconf+=( --enable-stack-protector=all )
        fi
 
+       if version_is_at_least 2.25 ; then
+               myconf+=( --enable-stackguard-randomization )
+       else
+               myconf+=( $(use_enable hardened stackguard-randomization) )
+       fi
+
        [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
        if [[ $1 == "linuxthreads" ]] ; then