gdb: move version selection from gdb.mk to Config.in.host

This avoids duplication of the version selection between these two files.

Cc: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index d5e7814ce3a74380953ef7f25eaf19e01b0271d5..9c0c78ce87784ab2abf850379f6d2131fd16d49a 100644 (file)
--- 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 d06b61bd45b83985fe86849335f3536889c32261..69fb3bae21e57e496dce2d9e059fc62ac6a3eb9c 100644 (file)
--- 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