diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-21 21:33:54 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-01-21 21:33:54 (GMT) |
| commit | 64aae637f835cb5dce12097f0d5fc70c0ca44e7d (patch) | |
| tree | da879d628d6687feace3616065078c899d25f12c | |
| parent | 8a50c2d2441f6fe1fec03ee9917ef937d0220b10 (diff) | |
debug/gdb: do not expose the ncurses version in the menuconfig
| -rw-r--r-- | config/debug/gdb.in | 26 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 16 |
2 files changed, 11 insertions, 31 deletions
diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 307fced..04b8f39 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -129,29 +129,3 @@ config GDB_VERSION default "7.0" if GDB_V_7_0 default "6.8" if GDB_V_6_8 default "snapshot" if GDB_V_snapshot - -if GDB_NATIVE - -comment "Native gdb needs a native ncurses library" - -choice - bool - prompt "ncurses version" - -config NCURSES_V_5_7 - bool - prompt "5.7" - -config NCURSES_V_5_6 - bool - prompt "5.6 (OBSOLETE)" - depends on OBSOLETE - -endchoice - -config NCURSES_VERSION - string - default "5.7" if NCURSES_V_5_7 - default "5.6" if NCURSES_V_5_6 - -endif # GDB_NATIVE --> ncurses diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index a81781d..fede1d5 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -1,5 +1,11 @@ # Build script for the gdb debug facility +# The version of ncurses to use. Yes, it's hard-coded. +# It's used only internally by crosstool-NG, and is +# not exposed outside, so we don't care about providing +# config options for this. +CT_DEBUG_GDB_NCURSES_VERSION="5.7" + do_debug_gdb_suffix() { case "${CT_GDB_VERSION}" in snapshot) ;; @@ -47,7 +53,7 @@ do_debug_gdb_get() { fi if [ "${do_ncurses}" = "y" ]; then - CT_GetFile "ncurses-${CT_NCURSES_VERSION}" .tar.gz \ + CT_GetFile "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" .tar.gz \ {ftp,http}://ftp.gnu.org/pub/gnu/ncurses \ ftp://invisible-island.net/ncurses fi @@ -67,8 +73,8 @@ do_debug_gdb_extract() { fi if [ "${do_ncurses}" = "y" ]; then - CT_Extract "ncurses-${CT_NCURSES_VERSION}" - CT_Patch "ncurses-${CT_NCURSES_VERSION}" + CT_Extract "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" + CT_Patch "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}" fi } @@ -154,7 +160,7 @@ do_debug_gdb_build() { # cross-compiling, and thus will use the ${CT_BUILD}-* # tools instead of searching for the native ones... CT_DoExecLog ALL \ - "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \ + "${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \ --build=${CT_REAL_BUILD} \ --host=${CT_BUILD} \ --prefix=/usr \ @@ -184,7 +190,7 @@ do_debug_gdb_build() { cd "${CT_BUILD_DIR}/build-ncurses" CT_DoExecLog ALL \ - "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \ + "${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ --with-build-cc=${CT_BUILD}-gcc \ |