summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Malm <gengor@gentoo.org>2009-04-15 23:31:16 +0000
committerGordon Malm <gengor@gentoo.org>2009-04-15 23:31:16 +0000
commitb090170d52e1d5eaa49a89dfeb6075b631100cb8 (patch)
treee65f8ecdf46365319fa35a4e22306c84784a479f /x11-base/xorg-server/xorg-server-1.4.2.ebuild
parentAllow installation from a binary package without requiring the CD (diff)
downloadgentoo-2-b090170d52e1d5eaa49a89dfeb6075b631100cb8.tar.gz
gentoo-2-b090170d52e1d5eaa49a89dfeb6075b631100cb8.tar.bz2
gentoo-2-b090170d52e1d5eaa49a89dfeb6075b631100cb8.zip
Filter SSP when building with <GCC4, bug #244352
(Portage version: 2.1.6.7/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'x11-base/xorg-server/xorg-server-1.4.2.ebuild')
-rw-r--r--x11-base/xorg-server/xorg-server-1.4.2.ebuild11
1 files changed, 9 insertions, 2 deletions
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)"