diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-04-16 03:56:04 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-04-16 03:56:04 +0000 |
| commit | 40e6f9bef5c92ce9b5f3c6f69799ce904aa3f525 (patch) | |
| tree | f1f9513f7d595a3a3063896c317ea799655105b6 /x11-base | |
| parent | Stable for HPPA (bug #251832). (diff) | |
| download | gentoo-2-40e6f9bef5c92ce9b5f3c6f69799ce904aa3f525.tar.gz gentoo-2-40e6f9bef5c92ce9b5f3c6f69799ce904aa3f525.tar.bz2 gentoo-2-40e6f9bef5c92ce9b5f3c6f69799ce904aa3f525.zip | |
Filter SSP when building with <GCC4 on x86 only, 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 | 10 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild | 10 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild | 10 |
4 files changed, 23 insertions, 13 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 52adf8763d32..c03f7483516d 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.393 2009/04/15 23:31:16 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.394 2009/04/16 03:56:04 gengor Exp $ + + 16 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 on x86 only, bug #244352 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: 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 1b7fcc261395..e126da37e64a 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-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.9 2009/04/15 23:31:16 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.10 2009/04/16 03:56:04 gengor Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -333,9 +333,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 + # Incompatible with GCC 3.x SSP on x86, bug #244352 + if use x86 ; then + if [[ $(gcc-major-version) -lt 4 ]]; then + filter-flags -fstack-protector + fi fi # Workaround 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 d3601a34faa3..59099fdce865 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.3 2009/04/15 23:31:16 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r4.ebuild,v 1.4 2009/04/16 03:56:04 gengor Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -341,9 +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 + # Incompatible with GCC 3.x SSP on x86, bug #244352 + if use x86 ; then + if [[ $(gcc-major-version) -lt 4 ]]; then + filter-flags -fstack-protector + fi fi # Nothing else provides new enough glxtokens.h 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 1aba6d286ebf..6bc707fb114b 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.9 2009/04/15 23:31:16 gengor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.10 2009/04/16 03:56:04 gengor Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -342,9 +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 + # Incompatible with GCC 3.x SSP on x86, bug #244352 + if use x86 ; then + if [[ $(gcc-major-version) -lt 4 ]]; then + filter-flags -fstack-protector + fi fi # Nothing else provides new enough glxtokens.h |