1.1 --- a/scripts/build/debug/300-gdb.sh	Tue May 20 21:32:39 2008 +0000
     1.2 +++ b/scripts/build/debug/300-gdb.sh	Wed Jun 18 12:33:32 2008 +0000
     1.3 @@ -5,6 +5,7 @@
     1.4  do_print_filename() {
     1.5      [ "${CT_GDB}" = "y" ] || return 0
     1.6      echo "gdb$(do_debug_gdb_suffix)"
     1.7 +    [ "${CT_GDB_NATIVE}" = "y" ] && echo "ncurses-${CT_NCURSES_VERSION}"
     1.8  }
     1.9  
    1.10  do_debug_gdb_suffix() {
    1.11 @@ -15,13 +16,19 @@
    1.12  }
    1.13  
    1.14  do_debug_gdb_get() {
    1.15 -    CT_GetFile "gdb$(do_debug_gdb_suffix)"           \
    1.16 -               {ftp,http}://ftp.gnu.org/pub/gnu/gdb \
    1.17 +    CT_GetFile "gdb$(do_debug_gdb_suffix)"              \
    1.18 +               {ftp,http}://ftp.gnu.org/pub/gnu/gdb     \
    1.19                 ftp://sources.redhat.com/pub/gdb/{{,old-}releases,snapshots/current}
    1.20 +    if [ "${CT_GDB_NATIVE}" = "y" ]; then
    1.21 +        CT_GetFile "ncurses-${CT_NCURSES_VERSION}"          \
    1.22 +                   {ftp,http}://ftp.gnu.org/pub/gnu/ncurses \
    1.23 +                   ftp://invisible-island.net/ncurses
    1.24 +    fi
    1.25  }
    1.26  
    1.27  do_debug_gdb_extract() {
    1.28      CT_ExtractAndPatch "gdb$(do_debug_gdb_suffix)"
    1.29 +    [ "${CT_GDB_NATIVE}" = "y" ] && CT_ExtractAndPatch "ncurses-${CT_NCURSES_VERSION}"
    1.30  }
    1.31  
    1.32  do_debug_gdb_build() {
    1.33 @@ -110,7 +117,38 @@
    1.34      fi
    1.35  
    1.36      if [ "${CT_GDB_NATIVE}" = "y" ]; then
    1.37 -        CT_DoStep EXTRA "Installing native gdb"
    1.38 +        CT_DoStep INFO "Installing native gdb"
    1.39 +
    1.40 +        CT_DoStep INFO "Installing ncurses library"
    1.41 +        CT_DoLog EXTRA "Configuring ncurses"
    1.42 +        mkdir -p "${CT_BUILD_DIR}/build-ncurses"
    1.43 +        cd "${CT_BUILD_DIR}/build-ncurses"
    1.44 +
    1.45 +        ncurses_opts=
    1.46 +        [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
    1.47 +
    1.48 +        "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
    1.49 +            --build=${CT_BUILD}                                 \
    1.50 +            --host=${CT_TARGET}                                 \
    1.51 +            --with-build-cc=${CT_CC}                            \
    1.52 +            --with-build-cpp=${CT_CC}                           \
    1.53 +            --with-build-cflags="${CT_CFLAGS_FOR_HOST}"         \
    1.54 +            --prefix=/usr                                       \
    1.55 +            --with-shared                                       \
    1.56 +            --without-sysmouse                                  \
    1.57 +            --without-progs                                     \
    1.58 +            --enable-termcap                                    \
    1.59 +            --without-develop                                   \
    1.60 +            ${ncurses_opts}                                     2>&1 |CT_DoLog ALL
    1.61 +
    1.62 +        CT_DoLog EXTRA "Building ncurses"
    1.63 +        make ${PARALLELMFLAGS}  2>&1 |CT_DoLog ALL
    1.64 +
    1.65 +        CT_DoLog EXTRA "Installing ncurses"
    1.66 +        make DESTDIR="${CT_SYSROOT_DIR}" install    2>&1 |CT_DoLog ALL
    1.67 +
    1.68 +        CT_EndStep
    1.69 +
    1.70          CT_DoLog EXTRA "Configuring native gdb"
    1.71  
    1.72          mkdir -p "${CT_BUILD_DIR}/build-gdb-native"
    1.73 @@ -127,7 +165,7 @@
    1.74              --disable-gdbtk                             \
    1.75              --without-x                                 \
    1.76              --disable-sim                               \
    1.77 -            --disable-gdbserver                          \
    1.78 +            --disable-gdbserver                         \
    1.79              --without-included-gettext                  \
    1.80              ${extra_config}                             2>&1 |CT_DoLog ALL
    1.81