debug/gdb: fix tic install path, tell ncurses where to find it

ncurses 5.9 wants tic to be either one of:
 - $TIC_PATH
 - /usr/bin/tic

Of course, se do not want the latter, for it can be incompatible if the
ncurses in the build system is too old (eg. RHEL 5.6, Debian Lenny...).
So, force TIC_PATH to the location of our own tic.

Also, install tic alongside the other build tools, not in a sub-dir
of the toolchain installation dir.

Signed-off-by: Willy Tarreau <w@1wt.eu>
[yann.morin.1998@anciens.enib.fr: install in builtools/bin, move TIC_PATH]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2011-11-15 19:11:57 +01:00 committed by Willy Tarreau
parent c0b275a3bf
commit 2183a850e2

View File

@ -219,13 +219,14 @@ do_debug_gdb_build() {
CT_DoExecLog ALL make ${JOBSFLAGS} -C include
CT_DoExecLog ALL make ${JOBSFLAGS} -C progs "tic${tic_ext}"
CT_DoExecLog ALL install -d -m 0755 "${CT_PREFIX_DIR}/buildtools"
CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_PREFIX_DIR}/buildtools"
CT_DoExecLog ALL install -d -m 0755 "${CT_BUILDTOOLS_PREFIX_DIR}/bin"
CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_BUILDTOOLS_PREFIX_DIR}/bin"
mkdir -p "${CT_BUILD_DIR}/build-ncurses"
cd "${CT_BUILD_DIR}/build-ncurses"
CT_DoExecLog CFG \
TIC_PATH="${CT_BUILDTOOLS_PREFIX_DIR}/bin/tic${tic_ext}" \
"${CT_SRC_DIR}/ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}/configure" \
--build=${CT_BUILD} \
--host=${CT_TARGET} \
@ -243,9 +244,6 @@ do_debug_gdb_build() {
CT_DoExecLog ALL make install
# 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")