Add fix for arm build

Package-Manager: portage-2.1.7.16/cvs/Linux ia64

4 files changed, 15 insertions, 8 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9ca104a08c10..e59e3545738d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.58 2010/02/19 15:27:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.59 2010/02/23 18:26:17 armin76 Exp $
+
+  23 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-5.0.322.2.ebuild,
+  chromium-9999.ebuild:
+  Add fix for arm build
 
   19 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.307.9.ebuild, chromium-5.0.322.2.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index dcc0aaae2bae..d366b0eb0836 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -11,7 +11,7 @@ DIST chromium-5.0.322.2.tar.bz2 147189476 RMD160 3f4cb014d6c0c75b0318aa83c3b7ce6
 EBUILD chromium-5.0.307.5.ebuild 5786 RMD160 61a2bed81f5cc122a1e10899ab4c77d1564c8da1 SHA1 7c7a7e2d997904b37929359d121407e35b1bf7b3 SHA256 15450c87c1d59535cf6a911c4277b26f9c20c691fe2f3b69c05804a4cf48d3d1
 EBUILD chromium-5.0.307.7.ebuild 5786 RMD160 eb13f7869f316d923031521d813cd90889b29a0a SHA1 eff5b132de524a900615c002f4eef4666513ac39 SHA256 99f62591873eaccbd6988f0bae9e4dc84c2f86e2c2cb19a1b730ae2d2e2ed302
 EBUILD chromium-5.0.307.9.ebuild 5924 RMD160 9224ac0227fe0c1363c2dbe48c8e490cd8b5652d SHA1 47b83b8671a7a8d390006d920f8c77ae4aa9b7ba SHA256 80d9ef52210c0c003c436a51618c372eaa364878da2074bdd36927a6d97e6505
-EBUILD chromium-5.0.322.2.ebuild 5924 RMD160 f2b4e9d86939d6693c5ce07d8b604c3ead67add8 SHA1 0c4b918d566a921acf01fe80c68c321cd3d4a360 SHA256 de7a9493e34507cda840fdbe0005e55d40d37bf9c276b6caf2faffbbe7e6cac3
-EBUILD chromium-9999.ebuild 7637 RMD160 02a544adaa644f39f94b8ce370019562a3050232 SHA1 5868eb71169f100f5210d348cceb563b60cf6946 SHA256 916b9a36606045ee277b4ca264cb3ef8b1ad8c3ecd4554d60efcca8650db6225
-MISC ChangeLog 13424 RMD160 1cc462c310cdd09b17aac7104f0eab2eb3123843 SHA1 f51c710428f3cc265736efff2ae41bebb5313bbf SHA256 c69d30e3448d1bfeae2866ff998ab9bbad0448588bd82d6624274337891df322
+EBUILD chromium-5.0.322.2.ebuild 5977 RMD160 c6f23a55f31b59083c12a6455ae94e84cd111f05 SHA1 1a1aa28c36877021d956d02d7d26826584d60c8a SHA256 2918f727578a9175fad8ca608481c8a6f7d47ddd58332f9232157771d775a1e1
+EBUILD chromium-9999.ebuild 7689 RMD160 b088bcfd18550de1bfca11b80bb1dafd3ad97361 SHA1 c5f1ca2d09320273eb6b06ba4feaa3b699a9fe0c SHA256 c7efbd458504c5d57fb9ac41823e522f618981ce4b83c5752d11c40fb3e59791
+MISC ChangeLog 13546 RMD160 210b64535230fb370d469c21b3569c86065854f9 SHA1 cfbff29fafe6cf2b60cb6c98e5cec20d5b8c0133 SHA256 e891a1efa8b0f4a5428e9f21fc51d84c7a2cb4bf86b66c4be4eacc6a98c07db0
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-5.0.322.2.ebuild b/www-client/chromium/chromium-5.0.322.2.ebuild
index 7bdf04afb389..a8542239c5f5 100644
--- a/www-client/chromium/chromium-5.0.322.2.ebuild
+++ b/www-client/chromium/chromium-5.0.322.2.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-5.0.322.2.ebuild,v 1.3 2010/02/19 15:27:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.322.2.ebuild,v 1.4 2010/02/23 18:26:17 armin76 Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -86,6 +86,9 @@ src_prepare() {
 src_configure() {
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
 
+	# Fails to build on arm if we don't do this
+	use arm && append-flags -fno-tree-sink
+
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp
 	cat << EOF > "${S}"/.gyp/include.gypi
@@ -116,7 +119,6 @@ EOF
 
 	if use arm; then
 		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-		append-flags -fno-tree-sink
 	fi
 
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index e74380140a16..2b83a69c353a 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.29 2010/02/19 15:27:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.30 2010/02/23 18:26:17 armin76 Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -129,6 +129,8 @@ src_prepare() {
 
 src_configure() {
 	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+	# Fails to build on arm if we don't do this
+	use arm && append-flags -fno-tree-sink
 
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp
@@ -160,7 +162,6 @@ EOF
 
 	if use arm; then
 		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-		append-flags -fno-tree-sink
 	fi
 
 	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then