zorry       14/08/04 23:03:28

  Modified:             ChangeLog toolchain.eclass
  Log:
  Fix bug #513706 ssp only on gnu CTARGET's

Revision  Changes    Path
1.1338               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1338&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1338&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1337&r2=1.1338

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1337
retrieving revision 1.1338
diff -u -r1.1337 -r1.1338
--- ChangeLog   3 Aug 2014 17:08:27 -0000       1.1337
+++ ChangeLog   4 Aug 2014 23:03:28 -0000       1.1338
@@ -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.1337 2014/08/03 
17:08:27 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1338 2014/08/04 
23:03:28 zorry Exp $
+
+  05 Aug 2014; Magnus Granberg <zo...@gentoo.org> toolchain.eclass:
+  Fix bug #513706 only use ssp on gnu CTARGETS
 
   03 Aug 2014; Maxim Koltsov <maksbo...@gentoo.org> leechcraft.eclass:
   Remove sourceforge SRC_URI for leechcraft packages, only leechcraft.org is



1.633                eclass/toolchain.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.633&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.633&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.632&r2=1.633

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- toolchain.eclass    1 Jun 2014 23:00:45 -0000       1.632
+++ toolchain.eclass    4 Aug 2014 23:03:28 -0000       1.633
@@ -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.632 2014/06/01 
23:00:45 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.633 2014/08/04 
23:03:28 zorry Exp $
 
 # Maintainer: Toolchain Ninjas <toolch...@gentoo.org>
 
@@ -1133,7 +1133,9 @@
                if use_if_iuse libssp ; then
                        confgcc+=( --enable-libssp )
                else
-                       export gcc_cv_libc_provides_ssp=yes
+                       if hardened_gcc_is_stable ssp: then
+                               export gcc_cv_libc_provides_ssp=yes
+                       fi
                        confgcc+=( --disable-libssp )
                fi
 
@@ -2161,7 +2163,7 @@
        elif [[ $1 == "ssp" ]] ; then
                if [[ ${CTARGET} == *-uclibc* ]] ; then
                        tocheck=${SSP_UCLIBC_STABLE}
-               else
+               elfi  [[ ${CTARGET} == *-gnu* ]] ; then
                        tocheck=${SSP_STABLE}
                fi
        else




Reply via email to