From patchwork Mon Dec 19 12:53:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5876 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 BD04D23E01 for ; Mon, 19 Dec 2011 12:54:04 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id A9B37A183F1 for ; Mon, 19 Dec 2011 12:54:04 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so1864142eaa.11 for ; Mon, 19 Dec 2011 04:54:04 -0800 (PST) Received: by 10.204.136.194 with SMTP id s2mr1367202bkt.96.1324299244509; Mon, 19 Dec 2011 04:54:04 -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.82.144 with SMTP id ac16cs5295bkc; Mon, 19 Dec 2011 04:54:04 -0800 (PST) Received: by 10.216.133.106 with SMTP id p84mr6854137wei.5.1324299243115; Mon, 19 Dec 2011 04:54:03 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id gh20si10496623wbb.16.2011.12.19.04.54.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Dec 2011 04:54:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of wookey@aleph1.co.uk designates 80.68.88.63 as permitted sender) client-ip=80.68.88.63; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of wookey@aleph1.co.uk designates 80.68.88.63 as permitted sender) smtp.mail=wookey@aleph1.co.uk 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 1Rcciv-0003dM-S1; Mon, 19 Dec 2011 12:54:02 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1Rccip-0003or-Rq; Mon, 19 Dec 2011 12:53:39 +0000 From: wookey@wookware.org To: buildd-tools-devel@lists.alioth.debian.org Cc: patches@linaro.org, Wookey Date: Mon, 19 Dec 2011 12:53:18 +0000 Message-Id: <1324299198-14640-7-git-send-email-wookey@wookware.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1324299198-14640-1-git-send-email-wookey@wookware.org> References: <1324299198-14640-1-git-send-email-wookey@wookware.org> X-SA-Exim-Connect-IP: 78.151.164.206 X-SA-Exim-Mail-From: wookey@aleph1.co.uk 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: [PATCH 7/7] Add CROSSBUILD_CORE_DEPENDS{arch} to core deps automatically 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: Wookey --- lib/Sbuild/Build.pm | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index 966fb32..05473ec 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -636,7 +636,12 @@ sub run_fetch_install_packages { $self->check_abort(); $self->set('Install Start Time', time); $self->set('Install End Time', $self->get('Install Start Time')); - $resolver->add_dependencies('CORE', join(", ", @{$self->get_conf('CORE_DEPENDS')}) , "", "", "", "", ""); + my @coredeps = @{$self->get_conf('CORE_DEPENDS')}; + my $crosscoredeps; + if ($self->get_conf('HOST_ARCH') ne $self->get_conf('BUILD_ARCH')) { + $crosscoredeps = $self->get_conf('CROSSBUILD_CORE_DEPENDS'); + } + $resolver->add_dependencies('CORE', join(", ", @coredeps, @{$crosscoredeps->{$self->get_conf('HOST_ARCH')}}) , "", "", "", "", ""); if (!$resolver->install_deps('core', 'CORE')) { Sbuild::Exception::Build->throw(error => "Core build dependencies not satisfied; skipping", failstage => "install-deps");