diff options
| author |   Willy Tarreau <w@1wt.eu> | 2011-11-15 18:11:57 (GMT) |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2011-11-15 18:11:57 (GMT) |
| commit | b8a99b8be0b0dcb51890239a98c41ab3bf505d68 (patch) | |
| tree | 8adaf60f81f2b0d9afebed0066d2f4771f4b060b | |
| parent | 581101a3293e21f85a5641ec63c669d539ed61bc (diff) | |
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>
(transplanted from bd17cca444ae09af0aae3e2390fa068147e2f4e3)
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 289d26a..7c4731b 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -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") |