From patchwork Wed Jan 29 21:44:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 315231 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 192192C00A6 for ; Thu, 30 Jan 2014 08:44:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3136C3387D; Wed, 29 Jan 2014 21:44:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ikDqxZaPSSD3; Wed, 29 Jan 2014 21:44:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 762C433882; Wed, 29 Jan 2014 21:44:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 99EF01CE909 for ; Wed, 29 Jan 2014 21:44:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 921D9903D2 for ; Wed, 29 Jan 2014 21:44:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aNs-GALicvai for ; Wed, 29 Jan 2014 21:44:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id E7619903D1 for ; Wed, 29 Jan 2014 21:44:45 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1W8cz8-0007K2-C2; Wed, 29 Jan 2014 22:47:50 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.82) (envelope-from ) id 1W8cw6-00056v-FI; Wed, 29 Jan 2014 22:44:42 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Wed, 29 Jan 2014 22:44:41 +0100 Message-Id: <1391031881-19546-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <52E9752E.2020602@mind.be> References: <52E9752E.2020602@mind.be> Subject: [Buildroot] [PATCH] gdb: move version selection from gdb.mk to Config.in.host X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This avoids duplication of the version selection between these two files. Cc: Spenser Gilliland Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Thomas Petazzoni --- Warning: I have not really tested this! Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gdb/Config.in.host | 14 +++++++++----- package/gdb/gdb.mk | 14 -------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index d5e7814..9c0c78c 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -51,15 +51,19 @@ choice endchoice +endif + +# If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "6.6a" if BR2_GDB_VERSION_6_6 - default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 + depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB + default "6.6a" if BR2_GDB_VERSION_6_6 || \ + (!BR2_PACKAGE_HOST_GDB && BR2_bfin) + default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \ + (!BR2_PACKAGE_HOST_GDB && BR2_avr32) default "7.2a" if BR2_GDB_VERSION_7_2 default "7.3.1" if BR2_GDB_VERSION_7_3 default "7.4.1" if BR2_GDB_VERSION_7_4 - default "7.5.1" if BR2_GDB_VERSION_7_5 + default "7.5.1" if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze - -endif diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index d06b61b..69fb3ba 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -7,20 +7,6 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) GDB_SITE = $(BR2_GNU_MIRROR)/gdb -# When no version is defined, it means that cross-gdb for the host has -# not been enabled, and we will only build gdbserver or gdb for the -# target. In this case, use the latest available version -# automatically. -ifeq ($(GDB_VERSION),) -ifeq ($(BR2_bfin),y) -GDB_VERSION = 6.6a -else ifeq ($(BR2_avr32),y) -GDB_VERSION = 6.7.1-avr32-2.1.5 -else -GDB_VERSION = 7.5.1 -endif -endif - ifeq ($(BR2_arc),y) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz