Fix a build error with -Os, bug #352457 by Francois Chenier <belgix@virginbroadband.com.au>.

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

5 files changed, 23 insertions, 8 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index a6f490f55450..91a8fae495f9 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.269 2011/01/28 09:52:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.270 2011/01/30 17:08:04 phajdan.jr Exp $
+
+  30 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-9.0.597.83.ebuild, chromium-10.0.648.6.ebuild,
+  chromium-9999.ebuild:
+  Fix a build error with -Os, bug #352457 by Francois Chenier
+  <belgix@virginbroadband.com.au>.
 
   28 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
   Remove system-sqlite USE flag, it's broken upstream. Bug #352892 by fkhp
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index caad8c820c9f..4efabab0dc17 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -22,10 +22,10 @@ DIST chromium-8.0.552.237.tar.bz2 135425078 RMD160 9d95b45a2a509b407a5c43ae3b4b6
 DIST chromium-9.0.597.67.tar.bz2 142248742 RMD160 b8fa1f1202adbced7b9cd855456dca7fbaefcefd SHA1 10123fd2fe1c8be1aa8c9374e6529bab2c825b1e SHA256 7943f3d4721493cf8b042886b2bcd19a31dec5a3f2337acaa515fe3e2467ae32
 DIST chromium-9.0.597.83.tar.bz2 140806165 RMD160 26f3a1533eef15b7f0562cded048e770b64d417d SHA1 eee3a943df4a107d2c5cdfacea19222c69bbb0e1 SHA256 6e48665841d09b62f03323b1648cac27b6065dfefae86a4fa5ea6de6739b51af
 EBUILD chromium-10.0.642.2-r1.ebuild 10390 RMD160 84ed5e976254bca07b10a982739a4e161329365b SHA1 dd5a63c49a5174480b5b4fa21499df886c809bd0 SHA256 035e8685cf13e357239518517fefb043bb6bc10a700e683c89f909ed3da10291
-EBUILD chromium-10.0.648.6.ebuild 10375 RMD160 6465dc117fea2453fbf422a81f35e296d2a0f7d0 SHA1 35ee8059af8bebd2b61fb8e1bdccac802dfa8113 SHA256 91d5f6fde4b9c85da918364983a909206b8ba1a93a301195870269a196f7da35
+EBUILD chromium-10.0.648.6.ebuild 10449 RMD160 721b32de5687b650f6828c1c7f848c0a36ca7508 SHA1 04fcb26f85f4de283173aac64d4a3fa384163c60 SHA256 d01562683edb9f0c615cc8692f20110d888b5f2a2d97a0b489706bd04c572652
 EBUILD chromium-8.0.552.237.ebuild 8634 RMD160 eebed932e6c888ca9a9484e829d2512b2e864552 SHA1 78fce537dac9b8a20a1c4bc2377db4327a83d497 SHA256 f9e16d58a299288182b9085b2a421d8553b263f48de17f1a073e661ae952c577
 EBUILD chromium-9.0.597.67.ebuild 9331 RMD160 50fb39147b28b355a6203a06989b792608461e13 SHA1 db760536477fdc94ae8eac56c0b767f252710b9f SHA256 4eca16e8b8cd47d10f54e70e22f2614cd0c504b28568aaba0a0cb6418121088b
-EBUILD chromium-9.0.597.83.ebuild 9332 RMD160 44d66b41a604b16ed7b3febfc346cb9353b7f612 SHA1 326461a0084270a240a8acdb2bc0e268f2d8b7e6 SHA256 f11a47b98f50ba0285589e9f9a4c7c26c1993ac03d5d678e7148ca46abb9a8f1
-EBUILD chromium-9999.ebuild 11410 RMD160 252bd1a539c1ff39b8e36f3142e458fc27a7d935 SHA1 32dc5710b5b05675ebdf95e59f4bcec98d59fc07 SHA256 58f9ca6912676a41e8f9dae2d3897fb6107307eb7baa354a3c3353f4da4d93d3
-MISC ChangeLog 59705 RMD160 51e0e7559bcf6da358696eda76b02783fb26f409 SHA1 9aba86da442f79606f94f02b655a62d0fb36eeca SHA256 22c142e4830db77b5c319d7ca3844d1775d6373852b9958defb2b558e9b6b30b
+EBUILD chromium-9.0.597.83.ebuild 9406 RMD160 f855da978eefe6c849417eb25266d8c0a90865cf SHA1 4d4015329fb69b508d7d0fbf2769f00d3ce448c8 SHA256 922663bcadcf2599d037401ed95f391daba03f76d3312cd9adbaf9f05eb9b797
+EBUILD chromium-9999.ebuild 11484 RMD160 ba97e45ba8ce1eb682e5120f3da8647906f8368b SHA1 5227647634c08252a8cf452762f559cb4a582e93 SHA256 75f8636d6de74747a9e90d2dc6bcddbd5c8984a0aa9f2aa5703867433bdf05ac
+MISC ChangeLog 59940 RMD160 71b33fb4d1f87870d77e49ed39ffda904ea43da7 SHA1 095962de2c64dbf3a8d33265b5e22436d3aca098 SHA256 a3d4b61fbbe3467513eb4631e510b72b3d5cd20e515e916b737d9c93065612f5
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-10.0.648.6.ebuild b/www-client/chromium/chromium-10.0.648.6.ebuild
index 23fb3b04ae93..51bcf4a2cddd 100644
--- a/www-client/chromium/chromium-10.0.648.6.ebuild
+++ b/www-client/chromium/chromium-10.0.648.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.6.ebuild,v 1.1 2011/01/27 10:46:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.6.ebuild,v 1.2 2011/01/30 17:08:04 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -266,6 +266,9 @@ src_configure() {
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
+	# Avoid a build error with -Os, bug #352457.
+	replace-flags "-Os" "-O2"
+
 	egyp ${myconf} || die
 }
 
diff --git a/www-client/chromium/chromium-9.0.597.83.ebuild b/www-client/chromium/chromium-9.0.597.83.ebuild
index c16304f2b1e1..12111c9f4662 100644
--- a/www-client/chromium/chromium-9.0.597.83.ebuild
+++ b/www-client/chromium/chromium-9.0.597.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.83.ebuild,v 1.1 2011/01/26 10:56:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.83.ebuild,v 1.2 2011/01/30 17:08:04 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -257,6 +257,9 @@ src_configure() {
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
+	# Avoid a build error with -Os, bug #352457.
+	replace-flags "-Os" "-O2"
+
 	egyp ${myconf} || die
 }
 
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index a9123019edec..ca3c1c5dc96e 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.129 2011/01/28 09:52:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.130 2011/01/30 17:08:04 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -287,6 +287,9 @@ src_configure() {
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
+	# Avoid a build error with -Os, bug #352457.
+	replace-flags "-Os" "-O2"
+
 	egyp ${myconf} || die
 }