diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-04-11 15:26:29 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-04-11 15:26:29 +0000 |
| commit | 9a7e0536929a8d2875d9049774bdafba715d4dcd (patch) | |
| tree | 21ba5d4601b5f89cdb2cfee4c201b9c1e5c3b22d /www-client/chromium/chromium-9999.ebuild | |
| parent | Some cleanup, remove unused versions (diff) | |
| download | historical-9a7e0536929a8d2875d9049774bdafba715d4dcd.tar.gz historical-9a7e0536929a8d2875d9049774bdafba715d4dcd.tar.bz2 historical-9a7e0536929a8d2875d9049774bdafba715d4dcd.zip | |
Apply arch detection logic from bug #296917 by ferret
<ferret@explodingferret.com>
Package-Manager: portage-2.1.7.17/cvs/Linux i686
Diffstat (limited to 'www-client/chromium/chromium-9999.ebuild')
| -rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index e50bf27054d4..098dc199e9a7 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.39 2010/04/09 17:29:05 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.40 2010/04/11 15:26:29 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability subversion toolchain-funcs @@ -171,16 +171,18 @@ EOF # Sandbox paths myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - if use amd64 ; then - myconf="${myconf} -Dtarget_arch=x64" - fi + # Use target arch detection logic from bug #296917. + local myarch="$ABI" + [[ $myarch = "" ]] && myarch="$ARCH" - if use x86 ; then + if [[ $myarch = amd64 ]] ; then + myconf="${myconf} -Dtarget_arch=x64" + elif [[ $myarch = x86 ]] ; then myconf="${myconf} -Dtarget_arch=ia32" - fi - - if use arm; then + elif [[ $myarch = arm ]] ; then myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" + else + die "Failed to determine target arch, got '$myarch'." fi if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then |