1.1 --- a/config/debug/gdb.in	Sun Jan 17 23:19:53 2010 +0100
     1.2 +++ b/config/debug/gdb.in	Thu Jan 21 22:33:54 2010 +0100
     1.3 @@ -129,29 +129,3 @@
     1.4      default "7.0" if GDB_V_7_0
     1.5      default "6.8" if GDB_V_6_8
     1.6      default "snapshot" if GDB_V_snapshot
     1.7 -
     1.8 -if GDB_NATIVE
     1.9 -
    1.10 -comment "Native gdb needs a native ncurses library"
    1.11 -
    1.12 -choice
    1.13 -    bool
    1.14 -    prompt "ncurses version"
    1.15 -
    1.16 -config NCURSES_V_5_7
    1.17 -    bool
    1.18 -    prompt "5.7"
    1.19 -
    1.20 -config NCURSES_V_5_6
    1.21 -    bool
    1.22 -    prompt "5.6 (OBSOLETE)"
    1.23 -    depends on OBSOLETE
    1.24 -
    1.25 -endchoice
    1.26 -
    1.27 -config NCURSES_VERSION
    1.28 -    string
    1.29 -    default "5.7" if NCURSES_V_5_7
    1.30 -    default "5.6" if NCURSES_V_5_6
    1.31 -
    1.32 -endif # GDB_NATIVE --> ncurses

     2.1 --- a/scripts/build/debug/300-gdb.sh	Sun Jan 17 23:19:53 2010 +0100
     2.2 +++ b/scripts/build/debug/300-gdb.sh	Thu Jan 21 22:33:54 2010 +0100
     2.3 @@ -1,5 +1,11 @@
     2.4  # Build script for the gdb debug facility
     2.5  
     2.6 +# The version of ncurses to use. Yes, it's hard-coded.
     2.7 +# It's used only internally by crosstool-NG, and is
     2.8 +# not exposed outside, so we don't care about providing
     2.9 +# config options for this.
    2.10 +CT_DEBUG_GDB_NCURSES_VERSION="5.7"
    2.11 +
    2.12  do_debug_gdb_suffix() {
    2.13      case "${CT_GDB_VERSION}" in
    2.14          snapshot)   ;;
    2.15 @@ -47,7 +53,7 @@
    2.16      fi
    2.17  
    2.18      if [ "${do_ncurses}" = "y" ]; then
    2.19 -        CT_GetFile "ncurses-${CT_NCURSES_VERSION}" .tar.gz  \
    2.20 +        CT_GetFile "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" .tar.gz  \
    2.21                     {ftp,http}://ftp.gnu.org/pub/gnu/ncurses \
    2.22                     ftp://invisible-island.net/ncurses
    2.23      fi
    2.24 @@ -67,8 +73,8 @@
    2.25      fi
    2.26  
    2.27      if [ "${do_ncurses}" = "y" ]; then
    2.28 -        CT_Extract "ncurses-${CT_NCURSES_VERSION}"
    2.29 -        CT_Patch "ncurses-${CT_NCURSES_VERSION}"
    2.30 +        CT_Extract "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}"
    2.31 +        CT_Patch "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}"
    2.32      fi
    2.33  }
    2.34  
    2.35 @@ -154,7 +160,7 @@
    2.36          # cross-compiling, and thus will use the ${CT_BUILD}-*
    2.37          # tools instead of searching for the native ones...
    2.38          CT_DoExecLog ALL                                        \
    2.39 -        "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
    2.40 +        "${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \
    2.41              --build=${CT_REAL_BUILD}                            \
    2.42              --host=${CT_BUILD}                                  \
    2.43              --prefix=/usr                                       \
    2.44 @@ -184,7 +190,7 @@
    2.45          cd "${CT_BUILD_DIR}/build-ncurses"
    2.46  
    2.47          CT_DoExecLog ALL                                        \
    2.48 -        "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
    2.49 +        "${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \
    2.50              --build=${CT_BUILD}                                 \
    2.51              --host=${CT_TARGET}                                 \
    2.52              --with-build-cc=${CT_BUILD}-gcc                     \