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 | b2911dec075d2874dd25fd3348c106662ddc26a2 (patch) | |
| tree | 59b80f960c8c5da722fe6d4818e05f272c0b8122 /x11-base | |
| parent | Stable for HPPA (bug #251832). (diff) | |
| download | historical-b2911dec075d2874dd25fd3348c106662ddc26a2.tar.gz historical-b2911dec075d2874dd25fd3348c106662ddc26a2.tar.bz2 historical-b2911dec075d2874dd25fd3348c106662ddc26a2.zip | |
Filter SSP when building with <GCC4 on x86 only, bug #244352
Package-Manager: portage-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/Manifest | 8 | ||||
| -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 |
5 files changed, 27 insertions, 17 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/Manifest b/x11-base/xorg-server/Manifest index e2eab3f5f8bb..6fff1ffb65f2 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 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 +EBUILD xorg-server-1.4.2.ebuild 18242 RMD160 5025001d9313976113862beb3b3a3d2bcec021eb SHA1 621e4792f21ba0d44c0e75c230f8e02a21b9bf4e SHA256 509128f370ad9b5dffee8a6a5953b453ceb323ca89fc2c7b292d72ca303fa4d0 +EBUILD xorg-server-1.5.3-r4.ebuild 16830 RMD160 5e7c962f68087b5480780c909d4bb20c3391ba57 SHA1 736f1daacd5478abb8799eaa890c9deb91143edc SHA256 f9de409a029f00e85cdc548d2fc1810dcb431315be5bfe0293209205b53559de +EBUILD xorg-server-1.5.3-r5.ebuild 16903 RMD160 1e1721134bfcfab9b502b041f84c18a835b1c9cd SHA1 6f47d8320695f29b78611fda8c5a68955e0de798 SHA256 2dbb0cdb8c645fbf8122ee371148a52f04a2db1722ccb02525041922df385d6a +MISC ChangeLog 92686 RMD160 384d563822ddfc12a0efda9e61c56804f73ea323 SHA1 1025375e1a4abbaece07cbc5a1a2d7ab358a0974 SHA256 475c107ac03df805ae7602b2a19d6a955c6781748be8d2c8880c7043a7010039 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 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 |