From d3e37c27b0c5b9b140224d76938d52718d5dbbf3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 8 Jul 2015 12:29:18 +0200 Subject: [PATCH] chromium: only require gcc-multilib when building natively for x86_64. --- srcpkgs/chromium/template | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 1388c20d5a8..2276cc806c0 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -13,7 +13,7 @@ checksum=405f52c6649f1d2937952fbcfcd238ba058db7d13edf4705f7027805f3ce1809 lib32disabled=yes nodebug=yes -hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids icu-devel" +hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids icu-devel ca-certificates" makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel @@ -25,13 +25,9 @@ makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel depends="hwids desktop-file-utils hicolor-icon-theme" nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe" -case "$XBPS_MACHINE" in - x86_64) hostmakedepends+=" ca-certificates gcc-c++-multilib";; -esac -case "$XBPS_TARGET_MACHINE" in - armv6l*) broken="http://build.voidlinux.eu/builders/armv6l_builder/builds/8050/steps/shell_3/logs/stdio";; - armv7l*) broken="http://build.voidlinux.eu/builders/armv7l_builder/builds/13211/steps/shell_3/logs/stdio";; -esac +if [ -z "$CROSS" -a "$XBPS_MACHINE" = "x86_64" ]; then + hostmakedepends+=" gcc-c++-multilib" +fi pre_configure() { # XXX xtraeme: fix gcc{,-c++}-multilib instead.