From 2a6e9ce59a09b51fe0cabe324fa63947280a84fb Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 11 Apr 2010 23:05:48 +0200
Subject: debug/gdb: remove snapshot version


diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 108044b..a41953c 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -37,12 +37,6 @@ config GDB_V_6_8
     bool
     prompt "6.8"
 
-config GDB_V_snapshot
-    bool
-    prompt "snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    depends on ! GDB_CROSS_INSIGHT
-
 endchoice
 
 config GDB_7_0_or_later
@@ -56,4 +50,3 @@ config GDB_VERSION
     default "7.0.1" if GDB_V_7_0_1
     default "7.0" if GDB_V_7_0
     default "6.8" if GDB_V_6_8
-    default "snapshot" if GDB_V_snapshot
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index afa783a..da6002f 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -6,13 +6,6 @@
 # config options for this.
 CT_DEBUG_GDB_NCURSES_VERSION="5.7"
 
-do_debug_gdb_suffix() {
-    case "${CT_GDB_VERSION}" in
-        snapshot)   ;;
-        *)          echo "-${CT_GDB_VERSION}";;
-    esac
-}
-
 do_debug_gdb_parts() {
     do_gdb=
     do_insight=
@@ -40,9 +33,9 @@ do_debug_gdb_get() {
     do_debug_gdb_parts
 
     if [ "${do_gdb}" = "y" ]; then
-        CT_GetFile "gdb$(do_debug_gdb_suffix)"              \
-                   {ftp,http}://ftp.gnu.org/pub/gnu/gdb     \
-                   ftp://sources.redhat.com/pub/gdb/{{,old-}releases,snapshots/current}
+        CT_GetFile "gdb-${CT_GDB_VERSION}"                          \
+                   {ftp,http}://ftp.gnu.org/pub/gnu/gdb             \
+                   ftp://sources.redhat.com/pub/gdb/{,old-}releases
     fi
 
     if [ "${do_insight}" = "y" ]; then
@@ -63,8 +56,8 @@ do_debug_gdb_extract() {
     do_debug_gdb_parts
 
     if [ "${do_gdb}" = "y" ]; then
-        CT_Extract "gdb$(do_debug_gdb_suffix)"
-        CT_Patch "gdb$(do_debug_gdb_suffix)"
+        CT_Extract "gdb-${CT_GDB_VERSION}"
+        CT_Patch "gdb-${CT_GDB_VERSION}"
     fi
 
     if [ "${do_insight}" = "y" ]; then
@@ -81,7 +74,7 @@ do_debug_gdb_extract() {
 do_debug_gdb_build() {
     local -a extra_config
 
-    gdb_src_dir="${CT_SRC_DIR}/gdb$(do_debug_gdb_suffix)"
+    gdb_src_dir="${CT_SRC_DIR}/gdb-${CT_GDB_VERSION}"
     insight_src_dir="${CT_SRC_DIR}/insight-${CT_GDB_VERSION}"
 
     # Version 6.3 and below behave badly with gdbmi
-- 
cgit v0.10.2-6-g49f6