Filter SSP when building with <GCC4, bug #244352

Package-Manager: portage-2.1.6.7/cvs/Linux i686
RepoMan-Options: --force

5 files changed, 30 insertions, 9 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 702be33811ff..52adf8763d32 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.392 2009/04/15 16:45:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.393 2009/04/15 23:31:16 gengor Exp $
+
+  15 Apr 2009; Gordon Malm <gengor@gentoo.org> xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.3-r4.ebuild, xorg-server-1.5.3-r5.ebuild:
+  Filter SSP when building with <GCC4, bug #244352
 
   15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   xorg-server-1.5.3-r5.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 8cf75e5bf997..e2eab3f5f8bb 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -55,8 +55,8 @@ DIST xorg-server-1.5.3-gentoo-patches-06.tar.bz2 55438 RMD160 a6ef6cf863df995917
 DIST xorg-server-1.5.3-gentoo-patches-07.tar.bz2 56276 RMD160 97afcb579d9ee10f4b2c715538557faa5d5f0eb6 SHA1 b48ea89f36e53062c4b903e613da48791bc36f64 SHA256 b80b45acb18068e7b4516cb58253f4cf1cd505f4d1a1b0b1c53e22ec7c12315b
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18356 RMD160 6c1611797bca8b0a27b5014a361804af5eb3363a SHA1 27e910f3215676611600af2cd386246468e64088 SHA256 b6a8d2eb16ed9fc7f49f39695097cb73483892e596e67a0c2a8cbcc6c28f836c
-EBUILD xorg-server-1.4.2.ebuild 18079 RMD160 d9b46d0bb9c002c1cd5399d0959044442b564418 SHA1 1afe5e271ee448564ddab9214fcb38b126314d00 SHA256 e52c813909e5177c54c291249a0a85304d9c1e8c68211c090f9e85830a51b1e8
-EBUILD xorg-server-1.5.3-r4.ebuild 16671 RMD160 1e728e523e9be0601e1e59a160b6203c4e4a7102 SHA1 c64664b4b5b4eb2ac5283016204a4ccddeb7cd6e SHA256 c054bfdbf37362c0aff7d6ad456792f2429d337c26a6b4a458e723232e812591
-EBUILD xorg-server-1.5.3-r5.ebuild 16743 RMD160 2f8fff293839031355d737a3b1bb23e436b35d14 SHA1 998eed29c4d3fc2d5ef5e2ad2192cefb7cc554de SHA256 998245bfb7a1366f4118b2c1cc4601325d712c51d7d3de27e3acee9e39777df6
-MISC ChangeLog 92305 RMD160 278fcf6a56cce3e9e73b71b45234717911190457 SHA1 bfa8d0ad0918e3f66fa36ec5f401f0a9d31238c6 SHA256 4b6bdb6c0d34985a9765b86a2ef9ffcc0c4a3ad18111d759e0b71bc0890ecaee
+EBUILD xorg-server-1.4.2.ebuild 18208 RMD160 15f67f807c619db113434276a06fabb44f6ce445 SHA1 4857ac7819e5615058a9d1e04034957c4af60a66 SHA256 8786b4f839488813647833e85adc5af2908e8698d0ede3ea0be5e874c9069618
+EBUILD xorg-server-1.5.3-r4.ebuild 16797 RMD160 10acbe60694a162f44436bb1f36286b7fca28a24 SHA1 30724c81570ca3eb6ea5a8813cd699daaed9d2df SHA256 0fb85c5cc1459ff27e99aa1be12e8db6cecabf03f9be3a19bf99d27b8f21e58e
+EBUILD xorg-server-1.5.3-r5.ebuild 16869 RMD160 782bd11e47154de7eae770e51aabf5d14da27fb5 SHA1 ad05d2ea8650980ff826c31dd77e6c8ab60b49e2 SHA256 11685c29dafa88ee696afed627a1a152e944f94fa119d9e90c9a4e7d87faf1f8
+MISC ChangeLog 92489 RMD160 8e2e3fbd2bbf2378ac67cfb39fb42d46d7d21136 SHA1 ed916c8fe2a665a785315fd9ceb346a4316db7fe SHA256 0091b63c9989d56b72037466ece9df73701fd61e1bfc852b0c594cd241c02d82
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
index d894a1c3ef5f..1b7fcc261395 100644
--- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.8 2008/12/13 04:24:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.9 2009/04/15 23:31:16 gengor Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -332,8 +332,15 @@ pkg_setup() {
 
 	# (#121394) Causes window corruption
 	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP, bug #244352
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags -fstack-protector
+	fi
+
 	# Workaround
 	append-flags -D_GNU_SOURCE
+
 	# Nothing else provides new enough glxtokens.h
 	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
 	OLD_IMPLEM="$(eselect opengl show)"
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild
index acb36f5f387d..d3601a34faa3 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild,v 1.2 2009/03/12 10:43:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild,v 1.3 2009/04/15 23:31:16 gengor Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -341,6 +341,11 @@ pkg_setup() {
 	# (#121394) Causes window corruption
 	filter-flags -fweb
 
+	# Incompatible with GCC 3.x SSP, bug #244352
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags -fstack-protector
+	fi
+
 	# Nothing else provides new enough glxtokens.h
 	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
 	OLD_IMPLEM="$(eselect opengl show)"
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
index dcd0802bb7c7..1aba6d286ebf 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.8 2009/04/15 16:45:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.9 2009/04/15 23:31:16 gengor Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -342,6 +342,11 @@ pkg_setup() {
 	# (#121394) Causes window corruption
 	filter-flags -fweb
 
+	# Incompatible with GCC 3.x SSP, bug #244352
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags -fstack-protector
+	fi
+
 	# Nothing else provides new enough glxtokens.h
 	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
 	OLD_IMPLEM="$(eselect opengl show)"