summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2010-02-23 18:26:17 +0000
committerRaúl Porcel <armin76@gentoo.org>2010-02-23 18:26:17 +0000
commit89c3ada77b07a6ab5f5919dd8b5d90afa6f8e3b0 (patch)
tree6a679449c4368462d1a633f2b2194364f8621252 /www-client
parentStable on amd64 wrt bug #306433 (diff)
downloadgentoo-2-89c3ada77b07a6ab5f5919dd8b5d90afa6f8e3b0.tar.gz
gentoo-2-89c3ada77b07a6ab5f5919dd8b5d90afa6f8e3b0.tar.bz2
gentoo-2-89c3ada77b07a6ab5f5919dd8b5d90afa6f8e3b0.zip
Add fix for arm build
(Portage version: 2.1.7.16/cvs/Linux ia64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog6
-rw-r--r--www-client/chromium/chromium-5.0.322.2.ebuild6
-rw-r--r--www-client/chromium/chromium-9999.ebuild5
3 files changed, 12 insertions, 5 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/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