"append-flags -fno-gcse" on amd64 with gcc 3, bug 178652.

Package-Manager: portage-2.1.4.4

4 files changed, 25 insertions, 9 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 2eb94a7d3b1e..e20a04535dbc 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.523 2008/03/09 21:45:56 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.524 2008/03/11 16:51:15 ingmar Exp $
+
+  11 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-4.3.2-r1.ebuild,
+  qt-4.3.4.ebuild:
+  "append-flags -fno-gcse" on amd64 with gcc 3, bug 178652.
 
   09 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org> qt-4.4.0_beta1.ebuild:
   Revert last commit.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index e95c49dfa651..de703d2f7616 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -39,16 +39,16 @@ DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc66622
 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
 EBUILD qt-3.3.4-r8.ebuild 10576 RMD160 24e821e4e3c0afa1945e3846e73065c7ac2f5e98 SHA1 d45683c76591d3ee2507a001a2caaf51449ae00d SHA256 843f2eb691d9403f4953b81eda236b5e994b70494b70f622813dc17a9b1f2113
 EBUILD qt-3.3.8-r4.ebuild 11694 RMD160 054ca74177797a4020e7d80b9277c26d300a1d11 SHA1 bd75957fed753ff00fc01b7659da14c48e3afdcb SHA256 64a69625317e726095a44c108cae5c2b3ae947a310747cf934490a6e40f52da9
-EBUILD qt-4.3.2-r1.ebuild 8786 RMD160 b5445c06fb7df31393c6c70e26786175cd361089 SHA1 5ded787ad7c5d56bf116c7580383f2f422a00abf SHA256 e4807314255894ed5d8c7676efecc8960ecbc880818839164918083e0e1bb669
+EBUILD qt-4.3.2-r1.ebuild 8936 RMD160 5f162263374ec07294422e3e815ca07015bd20c9 SHA1 97e0a8db5dbdc8c17fde814719db202bce8c6d09 SHA256 187eef7e3ae5945e323989ed75be0b757d9e5669c690dcc15222037b0b621205
 EBUILD qt-4.3.3.ebuild 8718 RMD160 432ee720745199be3d7ef972b79cb10af2f523ec SHA1 6e5414c1259cea0e70c00f796b411ae9bb6c0b6f SHA256 a5bf686c017159e6bd7c821dd8c37585c86753a1a7c6201f8af054784ae9eb20
-EBUILD qt-4.3.4.ebuild 8724 RMD160 5aad97b00c348a96639da61ba78d64c17cba5145 SHA1 3b04b2260cd3a68d09648221fe20cd67612cdd9e SHA256 c341fadd04696f88a3aa430d4baefd5e2914cfba6f7e73fece7856d311c58585
+EBUILD qt-4.3.4.ebuild 8876 RMD160 42f6aac8c009812a08cfd5facf16d451974b4c57 SHA1 e6620fadde24d8479fdf35b8577817e61b585ed4 SHA256 951cc6252ce6f9badce631f1777fbfe634b47ddb0b9c46f893891da53a2bb06b
 EBUILD qt-4.4.0_beta1.ebuild 748 RMD160 d63988b52b6c89ee8a4a1f169859a8a3e5c7087b SHA1 86347168e503f5ba1d82de5e84afd69c8b0ce3d3 SHA256 edb7140caac96d0d6d10ad644790077b90f9b37faf706c3a2df4c9468ec2d9c5
-MISC ChangeLog 39190 RMD160 5e57a38b654486eb6d29ab92e8cb52f9d2b30df3 SHA1 0f37caf47b4294c3640739476f7710f25e7b7b3f SHA256 93a054f0b748dc9e0f0a67a68b19996c5d2bea60971391b8a9b5ac0476c4aa70
+MISC ChangeLog 39344 RMD160 1dbb0ab0482a18f1b561e6e7612614fd2b50e886 SHA1 302fce98a1b42501cac20979f9d3106c8eb32064 SHA256 5683a994d4559bd1453a60efc2613cf809b255b078fad22d92e7827b9ea97619
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH1FqdfxJ68Jl1NeERAmXSAKCAwpdTQTVBflv6egtGdoEBu9yFrACglI1L
-zsjXNT0EwyKgNelvacWBrhY=
-=+2ou
+iD8DBQFH1rh+B18eXLOpYdkRAhG0AJ9WMtifOiDmFjrkdneatDpVPIEfHACghyar
+ummohGzHfzcPEukU1U3moUQ=
+=VgBR
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild
index d2d1cb98d7ea..01b545f94c46 100644
--- a/x11-libs/qt/qt-4.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.8 2008/03/05 16:40:05 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.9 2008/03/11 16:51:15 ingmar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -135,6 +135,12 @@ src_unpack() {
 		append-flags -fno-stack-protector
 	fi
 
+	# Bug 178652
+	if [[ $(gcc-major-version) == "3" ]] && use amd64; then
+		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
+		append-flags -fno-gcse
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
diff --git a/x11-libs/qt/qt-4.3.4.ebuild b/x11-libs/qt/qt-4.3.4.ebuild
index 59624660b250..4b5d6f56e312 100644
--- a/x11-libs/qt/qt-4.3.4.ebuild
+++ b/x11-libs/qt/qt-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild,v 1.2 2008/03/05 16:40:05 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild,v 1.3 2008/03/11 16:51:15 ingmar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -133,6 +133,12 @@ src_unpack() {
 		append-flags -fno-stack-protector
 	fi
 
+	# Bug 178652
+	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
+		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
+		append-flags -fno-gcse
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \