From patchwork Wed Dec 14 18:07:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5715 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 101A823E0C for ; Wed, 14 Dec 2011 18:07:31 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id E551FA180BB for ; Wed, 14 Dec 2011 18:07:30 +0000 (UTC) Received: by lahj13 with SMTP id j13so780100lah.11 for ; Wed, 14 Dec 2011 10:07:30 -0800 (PST) Received: by 10.204.133.213 with SMTP id g21mr1762532bkt.126.1323886050170; Wed, 14 Dec 2011 10:07:30 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs15709bkc; Wed, 14 Dec 2011 10:07:30 -0800 (PST) Received: by 10.227.60.4 with SMTP id n4mr3229290wbh.9.1323886048754; Wed, 14 Dec 2011 10:07:28 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id p38si2084930weq.49.2011.12.14.10.07.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 10:07:28 -0800 (PST) Received-SPF: neutral (google.com: 80.68.88.63 is neither permitted nor denied by best guess record for domain of wookey@wookware.org) client-ip=80.68.88.63; Authentication-Results: mx.google.com; spf=neutral (google.com: 80.68.88.63 is neither permitted nor denied by best guess record for domain of wookey@wookware.org) smtp.mail=wookey@wookware.org Received: from host-78-151-164-206.static.as13285.net ([78.151.164.206] helo=dream.aleph1.co.uk) by stoneboat.aleph1.co.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1RatEh-000680-AG for patches@linaro.org; Wed, 14 Dec 2011 18:07:28 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1RatEb-0006Rn-A6 for patches@linaro.org; Wed, 14 Dec 2011 18:07:17 +0000 Date: Wed, 14 Dec 2011 18:07:17 +0000 From: Wookey To: patches@linaro.org Message-ID: <20111214180717.GU28260@dream.aleph1.co.uk> MIME-Version: 1.0 Content-Disposition: inline Organization: Wookware User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: 78.151.164.206 X-SA-Exim-Mail-From: wookey@wookware.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on stoneboat.aleph1.co.uk X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.5 tests=AWL,BAYES_00 autolearn=no version=3.3.1 Subject: 0007-Fix-pass-a-HOST_ARCH-when-cross-compiling.patch X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on stoneboat.aleph1.co.uk) >From f33ec4441e19c3f21e7dd4891ff6f0fbbed4c3e8 Mon Sep 17 00:00:00 2001 From: Hector Oron Date: Mon, 12 Dec 2011 19:21:28 +0000 Subject: [PATCH 07/17] Fix pass -a HOST_ARCH when cross compiling Signed-off-by: Hector Oron --- lib/Sbuild/Build.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index 1eb099f..cdb52cf 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -1423,8 +1423,8 @@ sub build { $self->get_conf('BUILD_ENV_CMND')); push (@{$buildcmd}, 'dpkg-buildpackage'); - if ($self->get_conf('BUILD_ARCH') ne $self->get_conf('BUILD_ARCH')) { - push (@{$buildcmd}, '-a' . $self->get_conf('BUILD_ARCH')); + if ($self->get_conf('HOST_ARCH') ne $self->get_conf('BUILD_ARCH')) { + push (@{$buildcmd}, '-a' . $self->get_conf('HOST_ARCH')); } if (defined($self->get_conf('PGP_OPTIONS')) &&