summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2013-04-05 05:23:22 +0000
committerRyan Hill <rhill@gentoo.org>2013-04-05 05:23:22 +0000
commitbb3d4a21b57b884a792a901ada0b4418b23cbca1 (patch)
tree1ad0978c430dda325105259646e524cc7cfb72e2 /eclass
parenttest folder removed first up in Install phase, fixes Bug #464622 (diff)
downloadhistorical-bb3d4a21b57b884a792a901ada0b4418b23cbca1.tar.gz
historical-bb3d4a21b57b884a792a901ada0b4418b23cbca1.tar.bz2
historical-bb3d4a21b57b884a792a901ada0b4418b23cbca1.zip
Work around bootstrap comparison failures on ancient systems (bug #411333).
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/toolchain.eclass13
2 files changed, 13 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 2daf5715ac14..2ba693584b86 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.764 2013/04/01 11:05:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.765 2013/04/05 05:23:22 dirtyepic Exp $
+
+ 05 Apr 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
+ Work around bootstrap comparison failures on ancient systems (bug #411333).
01 Apr 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass:
Fix path handling in header wrapping code.
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index f090a1203846..f743b9a8acf4 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.573 2013/04/02 03:02:22 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.574 2013/04/05 05:23:22 dirtyepic Exp $
#
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -1360,6 +1360,7 @@ gcc_do_make() {
# This is mostly a stub function to be overwritten in an ebuild
gcc_do_filter_flags() {
+
strip-flags
# In general gcc does not like optimization, and add -O2 where
@@ -1409,9 +1410,13 @@ gcc_do_filter_flags() {
;;
esac
- # Compile problems with these (bug #6641 among others)...
- #filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
-
+ case ${GCC_BRANCH_VER} in
+ 4.6)
+ # https://bugs.gentoo.org/411333
+ replace-cpu-flags pentium2 pentium3 pentium3m pentium-m i686
+ ;;
+ esac
+
# CFLAGS logic (verified with 3.4.3):
# CFLAGS:
# This conflicts when creating a crosscompiler, so set to a sane