[PATCH 1 of 2] debug/gdb: install dependable libs in a generic target static libs dir

["Yann E. MORIN" <yann dot morin dot 1998 at anciens dot enib dot fr>]

# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1282566736 -7200
# Node ID 4f6e68510f9831ae9d89cf31a23c26a121fb6133
# Parent  b1a572a1db148394a42dc2c972d7d3d131c5d3c8
debug/gdb: install dependable libs in a generic target static libs dir

For now, ncurses is the only dependable target library built for gdb.
But expat is coming, and there's no reason to install each library in
its own place.

So, install ncurses in a generic directory, where other dependable
libraries can be installed as well.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -119,9 +119,12 @@
     if [ "${CT_GDB_NATIVE}" = "y" ]; then
         local -a native_extra_config
         local -a ncurses_opt
+        local -a gdb_native_CFLAGS
 
         CT_DoStep INFO "Installing native gdb"
 
+        native_extra_config=("${extra_config[@]}")
+
         # GDB on Mingw depends on PDcurses, not ncurses
         if [ "${do_ncurses}" = "y" ]; then
             CT_DoLog EXTRA "Building static target ncurses"
@@ -167,7 +170,7 @@
                 --with-build-cc=${CT_BUILD}-gcc                                 \
                 --with-build-cpp=${CT_BUILD}-gcc                                \
                 --with-build-cflags="${CT_CFLAGS_FOR_HOST}"                     \
-                --prefix="${CT_BUILD_DIR}/ncurses"                              \
+                --prefix="${CT_BUILD_DIR}/static-target"                        \
                 --without-shared                                                \
                 --without-sysmouse                                              \
                 --without-progs                                                 \
@@ -180,6 +183,11 @@
 
             # We no longer need the temporary tic. Remove it
             CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/buildtools/tic${tic_ext}"
+
+            native_extra_config+=("--with-curses")
+            # There's no better way to tell gdb where to find -lcurses... :-(
+            gdb_native_CFLAGS+=("-I${CT_BUILD_DIR}/static-target/include")
+            gdb_native_CFLAGS+=("-L${CT_BUILD_DIR}/static-target/lib")
         fi # do_ncurses
 
         CT_DoLog EXTRA "Configuring native gdb"
@@ -187,7 +195,6 @@
         mkdir -p "${CT_BUILD_DIR}/build-gdb-native"
         cd "${CT_BUILD_DIR}/build-gdb-native"
 
-        native_extra_config=("${extra_config[@]}")
         case "${CT_THREADS}" in
             none)   native_extra_config+=("--disable-threads");;
             *)      native_extra_config+=("--enable-threads");;
@@ -203,13 +210,11 @@
 
         export ac_cv_func_strncmp_works=yes
 
-        gdb_native_CFLAGS="-I${CT_BUILD_DIR}/ncurses/include -L${CT_BUILD_DIR}/ncurses/lib"
-
         CT_DoLog DEBUG "Extra config passed: '${native_extra_config[*]}'"
 
         CC="${CC_for_gdb}"                              \
         LD="${LD_for_gdb}"                              \
-        CFLAGS="${gdb_native_CFLAGS}"                   \
+        CFLAGS="${gdb_native_CFLAGS[@]}"                \
         CT_DoExecLog ALL                                \
         "${gdb_src_dir}/configure"                      \
             --build=${CT_BUILD}                         \



--
For unsubscribe information see http://sourceware.org/lists.html#faq