# HG changeset patch # User Willy Tarreau # Date 1321380717 -3600 # Node ID bd17cca444ae09af0aae3e2390fa068147e2f4e3 # Parent c6d10ee4ab25a8b0547b69e9a101d856d3b951a1 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 [yann.morin.1998@anciens.enib.fr: install in builtools/bin, move TIC_PATH] Signed-off-by: "Yann E. MORIN" diff -r c6d10ee4ab25 -r bd17cca444ae scripts/build/debug/300-gdb.sh --- a/scripts/build/debug/300-gdb.sh Mon Nov 14 13:29:12 2011 +0100 +++ b/scripts/build/debug/300-gdb.sh Tue Nov 15 19:11:57 2011 +0100 @@ -219,13 +219,14 @@ 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 @@ 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")