From patchwork Wed Dec 14 17:54:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wookey X-Patchwork-Id: 5710 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 09F8723E0E for ; Wed, 14 Dec 2011 17:55:56 +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 F37EEA18067 for ; Wed, 14 Dec 2011 17:55:55 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so972414eaa.11 for ; Wed, 14 Dec 2011 09:55:55 -0800 (PST) Received: by 10.205.127.12 with SMTP id gy12mr1698259bkc.108.1323885355792; Wed, 14 Dec 2011 09:55:55 -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 hg2cs15408bkc; Wed, 14 Dec 2011 09:55:55 -0800 (PST) Received: by 10.216.138.1 with SMTP id z1mr1627714wei.55.1323885354277; Wed, 14 Dec 2011 09:55:54 -0800 (PST) Received: from stoneboat.aleph1.co.uk (stoneboat.aleph1.co.uk. [80.68.88.63]) by mx.google.com with ESMTPS id d6si1985562wbh.56.2011.12.14.09.55.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Dec 2011 09:55:54 -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 1Rat3S-0005JX-Tp; Wed, 14 Dec 2011 17:55:53 +0000 Received: from wookey by dream.aleph1.co.uk with local (Exim 4.72) (envelope-from ) id 1Rat3M-0006Dm-Ug; Wed, 14 Dec 2011 17:55:40 +0000 From: wookey@linaro.org To: patches@linaro.org Cc: Wookey Date: Wed, 14 Dec 2011 17:54:33 +0000 Message-Id: <1323885273-23505-17-git-send-email-wookey@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1323885273-23505-1-git-send-email-wookey@linaro.org> References: <1323885273-23505-1-git-send-email-wookey@linaro.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=-1.9 required=4.5 tests=AWL,BAYES_00 autolearn=no version=3.3.1 Subject: [PATCH 17/17] Add MULTIARCH_CORE_DEPENDENCIES table 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/Conf.pm | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/lib/Sbuild/Conf.pm b/lib/Sbuild/Conf.pm index bb5ba03..fb1b066 100644 --- a/lib/Sbuild/Conf.pm +++ b/lib/Sbuild/Conf.pm @@ -822,7 +822,15 @@ sub setup ($) { DEFAULT => [], HELP => 'Additional per-build dependencies. Do not set by hand.' }, - 'BUILD_SOURCE' => { + 'CROSSBUILD_CORE_DEPENDS' => { + TYPE => 'HASH:ARRAY:STRING', + VARNAME => 'crossbuild_core_depends', + GROUP => 'Multiarch support (transitional)', + DEFAULT => { armel => ['g++-arm-linux-gnueabi', 'libc6-dev-armel-cross'], + armhf => ['g++-arm-linux-gnueabihf', 'libc6-dev-armhf-cross'] + }, + HELP => 'Per-architecture dependencies required for cross-building.' + }, 'BUILD_SOURCE' => { TYPE => 'BOOL', VARNAME => 'build_source', GROUP => 'Build options',