From 8854ff0a6093c3a1769a19f2fbabb9923b598efe Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 21 Aug 2014 12:14:29 +0200
Subject: [PATCH] srcpkgs: use "nocross=yes" where applicable.

---
 srcpkgs/chromium/template                         | 4 ++--
 srcpkgs/cross-arm-linux-gnueabi/template          | 5 +----
 srcpkgs/cross-arm-linux-gnueabihf/template        | 5 +----
 srcpkgs/cross-arm-linux-gnueabihf7/template       | 5 +----
 srcpkgs/cross-arm-linux-musleabi/template         | 5 +----
 srcpkgs/cross-i686-linux-musl/template            | 5 +----
 srcpkgs/cross-i686-pc-linux-gnu/template          | 5 +----
 srcpkgs/cross-mips-softfloat-linux-gnu/template   | 5 +----
 srcpkgs/cross-mipsel-softfloat-linux-gnu/template | 5 +----
 srcpkgs/cross-x86_64-linux-musl/template          | 5 +----
 srcpkgs/linux-tools/template                      | 5 +----
 11 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 3ef3c6b0488..96616890193 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -9,8 +9,8 @@ homepage="http://www.chromium.org/"
 license="BSD"
 
 lib32disabled=yes
-# XXX cannot be cross compiled right now, disabled for now.
-only_for_archs="i686 x86_64"
+nocross=yes
+
 distfiles="https://commondatastorage.googleapis.com/${pkgname}-browser-official/${pkgname}-${version}.tar.xz"
 checksum=0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316
 
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index 24db2b78cf2..461d26f8b1a 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -29,6 +29,7 @@ checksum="
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
@@ -36,10 +37,6 @@ depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 only_for_archs="i686 x86_64"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index af07366ef91..6c1841c335d 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -29,6 +29,7 @@ checksum="
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
@@ -36,10 +37,6 @@ depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 only_for_archs="i686 x86_64"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/template b/srcpkgs/cross-arm-linux-gnueabihf7/template
index 1522cd21dc5..2264813f74e 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf7/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf7/template
@@ -29,6 +29,7 @@ checksum="
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
@@ -36,10 +37,6 @@ depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 only_for_archs="i686 x86_64"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index e06594b4c77..49246a8a519 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -29,16 +29,13 @@ checksum="
  dac94112b9a22d2657cd3f36ca0d62ee1eb10707a22bfc97d5746147ef92852b"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 depends="${pkgname}-libc-${version}_${revision}"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 3479b49beb1..8f64f4f7ed7 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -28,6 +28,7 @@ checksum="
  dac94112b9a22d2657cd3f36ca0d62ee1eb10707a22bfc97d5746147ef92852b"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel"
@@ -35,10 +36,6 @@ nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 depends="${pkgname}-libc-${version}_${revision}"
 only_for_archs="i686 x86_64 x86_64-musl"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 2cf6b513573..bba2c34d80b 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -28,6 +28,7 @@ checksum="
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
 lib32disabled=yes
+nocross=yes
 only_for_archs="x86_64"
 create_wrksrc=yes
 hostmakedepends="perl flex"
@@ -35,10 +36,6 @@ makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template
index 7ff9afc4370..fb62cd8eece 100644
--- a/srcpkgs/cross-mips-softfloat-linux-gnu/template
+++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template
@@ -29,16 +29,13 @@ checksum="
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template
index 5069791d3d2..0727c31813b 100644
--- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template
+++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template
@@ -29,16 +29,13 @@ checksum="
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index d8d6899c069..5f579af97ee 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -27,6 +27,7 @@ checksum="
  dac94112b9a22d2657cd3f36ca0d62ee1eb10707a22bfc97d5746147ef92852b"
 
 lib32disabled=yes
+nocross=yes
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel"
@@ -34,10 +35,6 @@ nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
 depends="${pkgname}-libc-${version}_${revision}"
 only_for_archs="i686 i686-musl x86_64"
 
-if [ "$CROSS_BUILD" ]; then
-	msg_error "${pkgname}-${version}: cannot be cross compiled.\n"
-fi
-
 _apply_patch() {
 	local pname="$(basename $1)"
 
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 3fc5c89a302..af501baea0f 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -19,10 +19,7 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the
 	depends+=" x86_energy_perf_policy>=${version}"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	msg_red "${pkgname}-${version}: this package cannot be cross compiled right now.\n"     
-	exit 0
-fi
+nocross=yes
 
 do_build() {
 	cd ${wrksrc}/tools/perf