Add workaround for bug #331945 by Evan Teran <eteran@alum.rit.edu>, also confirmed by kernelOfTruth on forums. No bump because gcc-4.5 is not even in ~arch.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 22 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c15bf49064eb..01d2fbaeda94 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.151 2010/08/10 01:28:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.152 2010/08/10 19:36:59 phajdan.jr Exp $
+
+  10 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-6.0.472.25-r1.ebuild, chromium-9999.ebuild:
+  Add workaround for bug #331945 by Evan Teran <eteran@alum.rit.edu>, also
+  confirmed by kernelOfTruth on forums. No bump because gcc-4.5 is not even
+  in ~arch.
 
 *chromium-6.0.472.25-r1 (10 Aug 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index eb8abdcceb40..72b84a643226 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,8 +10,8 @@ DIST chromium-6.0.472.14.tar.bz2 123294791 RMD160 8e35457ae212d88bc6fc251258ae63
 DIST chromium-6.0.472.25.tar.bz2 123670988 RMD160 58826f025c884929c0420544b9f5fdbe698994d0 SHA1 76a3447dbefd860063a79333ec270d72cab9c30f SHA256 c62e619a68d90f593ee9dae5833c027318080652f690b2102510162782a4feaa
 EBUILD chromium-5.0.375.125.ebuild 5387 RMD160 dd089fb5b4332c0503a45d260c3ae3f0a805acd7 SHA1 4f49d131c499100aa36264a20b668021a1e0eec9 SHA256 4f470d73f600a78f72221c9378b7b2fe22bb87a678f257539cc022f75436c4b0
 EBUILD chromium-6.0.472.14.ebuild 6430 RMD160 d354a6f3829833a36fd3784466643869196bcd10 SHA1 4e39ca239bd350dcb237a9e9326434da5e454fcb SHA256 bec6780af7328b5691bfe4bfbb82f8836d06dff3487d8c8c9aa8f4877f61c491
-EBUILD chromium-6.0.472.25-r1.ebuild 6678 RMD160 cb459d4fb62f15db895c35198efe22d37df4171d SHA1 8ccc7bbd0dd6ed7f67251486142da678ebabbcf8 SHA256 d84af0ebe85b97ccef5f02ef0d74008a7c8a1259685e794fba778a03e6db0496
+EBUILD chromium-6.0.472.25-r1.ebuild 6827 RMD160 df4d373852e49b82e0309dab212196723c502524 SHA1 b9d73d8d5e83e88822e0697bfa021dbe3e2f3d31 SHA256 bb5fdd8943ad082ebde0635168ac81c32c81933ded7ed3980bbb221e3121dd1f
 EBUILD chromium-6.0.472.25.ebuild 6982 RMD160 c6370ff0745a7a934ddec943a21d411e0c773434 SHA1 b38197fec6aefa747882318e385671f1a4fbaeae SHA256 a81a034dbf52ff0e70ade48463810f907482c1626c0002ba57226caa4b96164e
-EBUILD chromium-9999.ebuild 8798 RMD160 b294242e183e7af53ab5ce16553c8aed4bb642fd SHA1 30d9231624ac41ff1e5f050a87149f3621acf3d8 SHA256 cd23fcac5f3d285ef9d93a4fbbf9bdcadffb1e46fd9f5025c0b779f01b3f9ca5
-MISC ChangeLog 33322 RMD160 d03473ae3ea6c822d886e99cdd935ab65e3f730a SHA1 7faac6ebe780b04f59546c379f0c55bb25263de0 SHA256 912b41c355697a8714c900f7550714564c30a60245bab8607148f2cac14f2da2
+EBUILD chromium-9999.ebuild 8947 RMD160 6333004ac73fd917b8b9151b222c10097c43f147 SHA1 715775e358fae136661fbb860291a6f59d8f8469 SHA256 38af6cc7f9f266ba4dc6b7df050ba50adbbfe9e74a01b7adb0a13759d271e945
+MISC ChangeLog 33596 RMD160 318650c434ddebd253618445f59c17db93edc3ab SHA1 f46aff97bf25d72d46e4e6a7a7b27d2af5b317c7 SHA256 50fd532f486f41168bf09681af83a4067edc1cd92760d9b971a2096d5213d5a7
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
diff --git a/www-client/chromium/chromium-6.0.472.25-r1.ebuild b/www-client/chromium/chromium-6.0.472.25-r1.ebuild
index 39d6e2dd71d1..0aab0438a380 100644
--- a/www-client/chromium/chromium-6.0.472.25-r1.ebuild
+++ b/www-client/chromium/chromium-6.0.472.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.1 2010/08/10 01:28:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.2 2010/08/10 19:36:59 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -157,6 +157,11 @@ src_configure() {
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Work around a likely GCC bug, see bug #331945.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
+		append-flags -fno-ipa-cp
+	fi
+
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
 	# the build to fail because of that.
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index d4db9e3749ce..cf5a3e7ab825 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.71 2010/08/08 18:41:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.72 2010/08/10 19:36:59 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -207,6 +207,11 @@ src_configure() {
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Work around a likely GCC bug, see bug #331945.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
+		append-flags -fno-ipa-cp
+	fi
+
 	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
 	# Depending on GCC version the warnings are different and we don't want
 	# the build to fail because of that.