From 529d2f6cbe81bcd22ab6e02b9dcc1d3d86dec759 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 30 Mar 2009 21:17:21 +0000
Subject: Cleanup the tic build used for native ncurses build, itself needed
 for native gdb build.

 /trunk/scripts/build/debug/300-gdb.sh |   24    12    12     0 ++++++++++++------------
 /trunk/scripts/build/internals.sh     |    1     0     1     0 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 2c2c27b..dc3c777 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -134,15 +134,17 @@ do_debug_gdb_build() {
     if [ "${CT_GDB_NATIVE}" = "y" ]; then
         CT_DoStep INFO "Installing native gdb"
 
-        CT_DoStep INFO "Installing native ncurses tic"
-        CT_DoLog EXTRA "Configuring ncurses tic"
-        mkdir -p "${CT_BUILD_DIR}/build-ncurses-build-tic"
-        cd "${CT_BUILD_DIR}/build-ncurses-build-tic"
+        CT_DoStep INFO "Installing ncurses library"
 
         ncurses_opts=
         [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
         [ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
 
+        CT_DoStep INFO "Installing native ncurses tic"
+        CT_DoLog EXTRA "Configuring ncurses tic"
+        mkdir -p "${CT_BUILD_DIR}/build-ncurses-build-tic"
+        cd "${CT_BUILD_DIR}/build-ncurses-build-tic"
+
         # Use build = CT_REAL_BUILD so that configure thinks it is
         # cross-compiling, and thus will use the ${CT_BUILD}-*
         # tools instead of searching for the native ones...
@@ -170,17 +172,12 @@ do_debug_gdb_build() {
         CT_DoExecLog ALL install -d -m 0755 "${CT_PREFIX_DIR}/bin"
         CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_PREFIX_DIR}/bin"
 
-        CT_EndStep
+        CT_EndStep # tic build
 
-        CT_DoStep INFO "Installing ncurses library"
         CT_DoLog EXTRA "Configuring ncurses"
         mkdir -p "${CT_BUILD_DIR}/build-ncurses"
         cd "${CT_BUILD_DIR}/build-ncurses"
 
-        ncurses_opts=
-        [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
-        [ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
-
         CT_DoExecLog ALL                                        \
         "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
             --build=${CT_BUILD}                                 \
@@ -202,7 +199,10 @@ do_debug_gdb_build() {
         mkdir -p "${CT_SYSROOT_DIR}/usr/bin"
         CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
 
-        CT_EndStep
+        # We no longer need the temporary tic. Remove it
+        CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/tic"
+
+        CT_EndStep # ncurses build
 
         CT_DoLog EXTRA "Configuring native gdb"
 
@@ -260,7 +260,7 @@ do_debug_gdb_build() {
 
         unset ac_cv_func_strncmp_works
 
-        CT_EndStep
+        CT_EndStep # native gdb build
     fi
 
     if [ "${CT_GDB_GDBSERVER}" = "y" ]; then
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 5b639db..575f07d 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -10,7 +10,6 @@ do_finish() {
     find "${CT_PREFIX_DIR}/bin" -name "${CT_BUILD}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
     find "${CT_PREFIX_DIR}/bin" -name "${CT_HOST}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG
     CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/makeinfo"
-    CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/tic"
 
     if [ "${CT_BARE_METAL}" != "y" ]; then
         CT_DoLog EXTRA "Installing the populate helper"
-- 
cgit v0.10.2-6-g49f6