diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-04-15 23:31:16 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-04-15 23:31:16 +0000 |
| commit | b090170d52e1d5eaa49a89dfeb6075b631100cb8 (patch) | |
| tree | e65f8ecdf46365319fa35a4e22306c84784a479f /x11-base | |
| parent | Allow installation from a binary package without requiring the CD (diff) | |
| download | gentoo-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')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.4.2.ebuild | 11 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild | 7 |
4 files changed, 26 insertions, 5 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/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)" |