Backport GCC 4.2 -O2 workaround for ivopts bug from 7.0.1.

Package-Manager: portage-2.1.3.3

8 files changed, 70 insertions, 35 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index e770472a6a04..131750424118 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.156 2007/08/11 08:47:04 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.157 2007/08/12 05:12:36 dberkholz Exp $
+
+  12 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-6.5-r3.ebuild,
+  mesa-6.5.1-r1.ebuild, mesa-6.5.1-r4.ebuild, mesa-6.5.2.ebuild,
+  mesa-6.5.2-r1.ebuild, mesa-6.5.3.ebuild:
+  Backport GCC 4.2 -O2 workaround for ivopts bug from 7.0.1.
 
 *mesa-7.0.1 (11 Aug 2007)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6eb60d973d0c..70a88a8b8b5f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -55,38 +55,38 @@ DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6
 DIST MesaLib-6.5.3.tar.bz2 3351899 RMD160 becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e SHA1 8ab86e54976752028fbffcc21a9e0d2ebefeeff4 SHA256 f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 DIST MesaLib-7.0.1.tar.bz2 3343538 RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 SHA1 deb1002cf377ba8bd9407bd3cf573f8c8be31671 SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
-EBUILD mesa-6.5-r3.ebuild 9059 RMD160 0484bdc704952f382a4e60f8842198b9d52e5265 SHA1 d0d1579fa57c90ad82df40d974f0707843adc0c2 SHA256 072139ef19e1204fa10cf46145c0787bd0cc61cc50657d05fc77a721275e1904
-MD5 f4b3593646f6067fb7818b8cc290272f mesa-6.5-r3.ebuild 9059
-RMD160 0484bdc704952f382a4e60f8842198b9d52e5265 mesa-6.5-r3.ebuild 9059
-SHA256 072139ef19e1204fa10cf46145c0787bd0cc61cc50657d05fc77a721275e1904 mesa-6.5-r3.ebuild 9059
-EBUILD mesa-6.5.1-r1.ebuild 8402 RMD160 e9a438998aecabbecc5003699694d4fee9bb89e6 SHA1 019834e96353cfe5274253edd129b15ebec3190f SHA256 9179e8704027888cfc4e85c72e9646762df2c7ad5caf1ebe67c56fa907d711d2
-MD5 6bfde0a6de20aa7331d213e1862ee418 mesa-6.5.1-r1.ebuild 8402
-RMD160 e9a438998aecabbecc5003699694d4fee9bb89e6 mesa-6.5.1-r1.ebuild 8402
-SHA256 9179e8704027888cfc4e85c72e9646762df2c7ad5caf1ebe67c56fa907d711d2 mesa-6.5.1-r1.ebuild 8402
-EBUILD mesa-6.5.1-r4.ebuild 9202 RMD160 42d67ba8cd8d9eab57128b19b4176afd273f7f14 SHA1 c254fb04f23ef5053583f8c7230a8c345b046e6e SHA256 0cbb43eb4b5e46f2e16ff4c3e408270e82554ea2604a59911a94029dcbf707bb
-MD5 122eb061aefc47febefdfd9fd3ac8246 mesa-6.5.1-r4.ebuild 9202
-RMD160 42d67ba8cd8d9eab57128b19b4176afd273f7f14 mesa-6.5.1-r4.ebuild 9202
-SHA256 0cbb43eb4b5e46f2e16ff4c3e408270e82554ea2604a59911a94029dcbf707bb mesa-6.5.1-r4.ebuild 9202
-EBUILD mesa-6.5.2-r1.ebuild 8903 RMD160 a700584a19d3a42bec25dbac332485973f735184 SHA1 774340c9acc1d5261213e8378091498f5697eb0b SHA256 d92627c31b1aa9d69d8570c3a91306e959025c6d4624955f1c273daac6e5836c
-MD5 6b88e41028b28d7d3ffb95fac9314ecf mesa-6.5.2-r1.ebuild 8903
-RMD160 a700584a19d3a42bec25dbac332485973f735184 mesa-6.5.2-r1.ebuild 8903
-SHA256 d92627c31b1aa9d69d8570c3a91306e959025c6d4624955f1c273daac6e5836c mesa-6.5.2-r1.ebuild 8903
-EBUILD mesa-6.5.2.ebuild 8862 RMD160 85b1b78e45df2795fc9793d46e8c52f1687b1861 SHA1 3349afd523948e1862fdb8217c42e50f71ce7b55 SHA256 2ca066a43c007fb4da7c73b2002ed82d3789471718e3253c7daee4bd4bb57a9f
-MD5 a8cc68bf2b942f5b8681f88ee7db3c45 mesa-6.5.2.ebuild 8862
-RMD160 85b1b78e45df2795fc9793d46e8c52f1687b1861 mesa-6.5.2.ebuild 8862
-SHA256 2ca066a43c007fb4da7c73b2002ed82d3789471718e3253c7daee4bd4bb57a9f mesa-6.5.2.ebuild 8862
-EBUILD mesa-6.5.3.ebuild 9270 RMD160 87cfdfcff627c968bbc4f44be54215c499960350 SHA1 04550d8f4899ad56b3e7a8a9de6e1b44d93ade83 SHA256 5477c09af361c71c4fb6c9a4762252a87f4abf1d329d4b8bc4742f6345a82bb2
-MD5 7da5951f778cfb8a7e2f4a748e557190 mesa-6.5.3.ebuild 9270
-RMD160 87cfdfcff627c968bbc4f44be54215c499960350 mesa-6.5.3.ebuild 9270
-SHA256 5477c09af361c71c4fb6c9a4762252a87f4abf1d329d4b8bc4742f6345a82bb2 mesa-6.5.3.ebuild 9270
+EBUILD mesa-6.5-r3.ebuild 9158 RMD160 90e42d89822dc6800c31c2074e2d25c54b608425 SHA1 5b8e903504a96cf6765a8aa5b1d1de85c1ddb805 SHA256 b84d528a32724c557e4a708125f05a2e7d4a96aa3c7929c5b4a95a9cad8a8cdc
+MD5 8a032392b8be25d67dff16a65e9a61d0 mesa-6.5-r3.ebuild 9158
+RMD160 90e42d89822dc6800c31c2074e2d25c54b608425 mesa-6.5-r3.ebuild 9158
+SHA256 b84d528a32724c557e4a708125f05a2e7d4a96aa3c7929c5b4a95a9cad8a8cdc mesa-6.5-r3.ebuild 9158
+EBUILD mesa-6.5.1-r1.ebuild 8501 RMD160 be3b1c528e5d44bfd86e20fb2589290a3757c26a SHA1 567c0329a8de45253c0dae73bb65420b3d78e311 SHA256 0ec3f1a1c56dc18e9d07d253aa622f37f78035de1b7aa5548173578341414c90
+MD5 458633f7f21228643ac21bc657f403fe mesa-6.5.1-r1.ebuild 8501
+RMD160 be3b1c528e5d44bfd86e20fb2589290a3757c26a mesa-6.5.1-r1.ebuild 8501
+SHA256 0ec3f1a1c56dc18e9d07d253aa622f37f78035de1b7aa5548173578341414c90 mesa-6.5.1-r1.ebuild 8501
+EBUILD mesa-6.5.1-r4.ebuild 9301 RMD160 09914276f3f0f7150242e9b262610c6656108e9c SHA1 341cea0ce32546fe1b00787a19d0bcf437d7fe64 SHA256 4f20f2edf64dd4bd3fcc0d5a682ff20264010d2db21f636320af09ef3445b9ab
+MD5 1c967e582dcfe3a12a59428cfba7e89f mesa-6.5.1-r4.ebuild 9301
+RMD160 09914276f3f0f7150242e9b262610c6656108e9c mesa-6.5.1-r4.ebuild 9301
+SHA256 4f20f2edf64dd4bd3fcc0d5a682ff20264010d2db21f636320af09ef3445b9ab mesa-6.5.1-r4.ebuild 9301
+EBUILD mesa-6.5.2-r1.ebuild 9003 RMD160 a1a5288b11b64b316601e2e382aa282b81ce4380 SHA1 c843733b61c484e3d0025c730c82a268cacabd0e SHA256 7f6d98b6557620b4160b4234fd3c4d96b9c0307ff01314b28d3d927a18e7d7a6
+MD5 650df0302694d30983941db72493a7d2 mesa-6.5.2-r1.ebuild 9003
+RMD160 a1a5288b11b64b316601e2e382aa282b81ce4380 mesa-6.5.2-r1.ebuild 9003
+SHA256 7f6d98b6557620b4160b4234fd3c4d96b9c0307ff01314b28d3d927a18e7d7a6 mesa-6.5.2-r1.ebuild 9003
+EBUILD mesa-6.5.2.ebuild 8961 RMD160 c597ec081ed588c6a15817f363fbc57a31bba431 SHA1 d2b02311d4efc1f8fafeb7495c0d2efd370d3a39 SHA256 44f845b16ee678c74085e75700b58254ac2893e787fc5eebf8f5668fae64013f
+MD5 1c7c7d16e6b009ef4cd156eac5373361 mesa-6.5.2.ebuild 8961
+RMD160 c597ec081ed588c6a15817f363fbc57a31bba431 mesa-6.5.2.ebuild 8961
+SHA256 44f845b16ee678c74085e75700b58254ac2893e787fc5eebf8f5668fae64013f mesa-6.5.2.ebuild 8961
+EBUILD mesa-6.5.3.ebuild 9369 RMD160 fc50e40734c8ffd919dac5c8f6516f511952ccd7 SHA1 fa601161149b719800809c751bae642601fbcdc7 SHA256 286c410abe2d155dbf90ee91e54ec78967b4eab36f2925b25b5c990e25cb5def
+MD5 ffbd96fb71e9a8681fe0ba82e2828e0a mesa-6.5.3.ebuild 9369
+RMD160 fc50e40734c8ffd919dac5c8f6516f511952ccd7 mesa-6.5.3.ebuild 9369
+SHA256 286c410abe2d155dbf90ee91e54ec78967b4eab36f2925b25b5c990e25cb5def mesa-6.5.3.ebuild 9369
 EBUILD mesa-7.0.1.ebuild 9210 RMD160 68093c6e0880249661c1ff5542d093283a97e7cc SHA1 ff74de9172f56160d452bffc679fee9ee6e8f3d2 SHA256 e03045db24274ba8195692d9aa12e457721134b882007016db0039aa77ffdcfb
 MD5 4309813d86e863eb13668445cc9576b7 mesa-7.0.1.ebuild 9210
 RMD160 68093c6e0880249661c1ff5542d093283a97e7cc mesa-7.0.1.ebuild 9210
 SHA256 e03045db24274ba8195692d9aa12e457721134b882007016db0039aa77ffdcfb mesa-7.0.1.ebuild 9210
-MISC ChangeLog 28378 RMD160 43b8cb039d816bc6fdf5b08503e594d358a69c6b SHA1 ae015678a72a60508aef551a302198cd2b0254f1 SHA256 0cd37dc3d7e8058ba72cfd71f5df72523f0d854ea2f66419cfa9f2b742cd9881
-MD5 318a1954b2190e368c40f4907bd7eb20 ChangeLog 28378
-RMD160 43b8cb039d816bc6fdf5b08503e594d358a69c6b ChangeLog 28378
-SHA256 0cd37dc3d7e8058ba72cfd71f5df72523f0d854ea2f66419cfa9f2b742cd9881 ChangeLog 28378
+MISC ChangeLog 28623 RMD160 7d617344ac7acd5ca7f27686b6bbed54e7a9774e SHA1 552f10b02e20b8031def6ee5b0437d574f0335db SHA256 01e40a4ed31f9e52d2094c959d996c69beb903c6ce4a79c0e6afff33d6f7cec1
+MD5 1102d189865d80ac3da1cd76cdcef696 ChangeLog 28623
+RMD160 7d617344ac7acd5ca7f27686b6bbed54e7a9774e ChangeLog 28623
+SHA256 01e40a4ed31f9e52d2094c959d996c69beb903c6ce4a79c0e6afff33d6f7cec1 ChangeLog 28623
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/media-libs/mesa/mesa-6.5-r3.ebuild b/media-libs/mesa/mesa-6.5-r3.ebuild
index 025812a97088..5d36a5ec7352 100644
--- a/media-libs/mesa/mesa-6.5-r3.ebuild
+++ b/media-libs/mesa/mesa-6.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.16 2007/07/30 07:40:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.17 2007/08/12 05:12:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -69,6 +69,11 @@ pkg_setup() {
 
 	append-flags -fno-strict-aliasing
 
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
 	if [[ ${KERNEL} == "FreeBSD" ]]; then
 		CONFIG="freebsd"
 	elif use x86; then
diff --git a/media-libs/mesa/mesa-6.5.1-r1.ebuild b/media-libs/mesa/mesa-6.5.1-r1.ebuild
index bb6fe3f169b0..82e971f9f37c 100644
--- a/media-libs/mesa/mesa-6.5.1-r1.ebuild
+++ b/media-libs/mesa/mesa-6.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.15 2007/07/30 07:40:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.16 2007/08/12 05:12:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -70,6 +70,11 @@ pkg_setup() {
 
 	append-flags -fno-strict-aliasing
 
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
 	if use x86-fbsd; then
 		CONFIG="freebsd-dri-x86"
 	elif use amd64-fbsd; then
diff --git a/media-libs/mesa/mesa-6.5.1-r4.ebuild b/media-libs/mesa/mesa-6.5.1-r4.ebuild
index 3e8b1be224d8..ab252ff91d26 100644
--- a/media-libs/mesa/mesa-6.5.1-r4.ebuild
+++ b/media-libs/mesa/mesa-6.5.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.5 2007/07/30 07:40:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.6 2007/08/12 05:12:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -80,6 +80,11 @@ pkg_setup() {
 
 	append-flags -fno-strict-aliasing
 
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
 	if use x86-fbsd; then
 		CONFIG="freebsd-dri-x86"
 	elif use amd64-fbsd; then
diff --git a/media-libs/mesa/mesa-6.5.2-r1.ebuild b/media-libs/mesa/mesa-6.5.2-r1.ebuild
index fcc8360e0a28..c676d20e764d 100644
--- a/media-libs/mesa/mesa-6.5.2-r1.ebuild
+++ b/media-libs/mesa/mesa-6.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.13 2007/08/07 12:48:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.14 2007/08/12 05:12:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -80,6 +80,11 @@ pkg_setup() {
 
 	append-flags -fno-strict-aliasing
 
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
 	if use x86-fbsd; then
 		CONFIG="freebsd-dri-x86"
 	elif use amd64-fbsd; then
diff --git a/media-libs/mesa/mesa-6.5.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild
index 3bad18968cde..eebc5141d852 100644
--- a/media-libs/mesa/mesa-6.5.2.ebuild
+++ b/media-libs/mesa/mesa-6.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.7 2007/07/30 07:40:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.8 2007/08/12 05:12:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -80,6 +80,11 @@ pkg_setup() {
 
 	append-flags -fno-strict-aliasing
 
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
 	if use x86-fbsd; then
 		CONFIG="freebsd-dri-x86"
 	elif use amd64-fbsd; then
diff --git a/media-libs/mesa/mesa-6.5.3.ebuild b/media-libs/mesa/mesa-6.5.3.ebuild
index 66c1a8faa3c9..7a12411f9477 100644
--- a/media-libs/mesa/mesa-6.5.3.ebuild
+++ b/media-libs/mesa/mesa-6.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.5 2007/08/01 21:48:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.6 2007/08/12 05:12:36 dberkholz Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
 
@@ -85,6 +85,11 @@ pkg_setup() {
 
 	append-flags -fno-strict-aliasing
 
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
 	if use x86-fbsd; then
 		CONFIG="freebsd-dri-x86"
 	elif use amd64-fbsd; then