diff options
author | Alexey Neyman <stilor@att.net> | 2018-01-30 06:47:26 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2018-01-30 06:47:26 (GMT) |
commit | 1c329c33bf4e1c6767454f98285e91ee19f1f724 (patch) | |
tree | 7862e1c9bfda8aabb266410a408b1a0bdef130b6 /scripts/build/companion_libs | |
parent | 30d741c1e5dbe03970b6c45f23a3b4ed697ae9f1 (diff) |
Ncurses fixes for 6.1
- Update to 20180129
- Throw in --disable-db-install if database is disabled; otherwise
'make install' tries to run tic which is not built.
- Select appropriate strip utility for the host; otherwise non-x86
architectures fail to install (unless --disable-stripping is also
added)
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/companion_libs')
-rw-r--r-- | scripts/build/companion_libs/220-ncurses.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index a32df42..97fb834 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -52,7 +52,8 @@ do_ncurses_for_host() { "--without-cxx-binding" \ "--without-ada" ) if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then - opts+=( "--disable-database" ) + opts+=( "--disable-database" \ + "--disable-db-install" ) fi if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" ) @@ -174,8 +175,12 @@ do_ncurses_backend() { # install.progs) do not do well with parallel make (-jX). CT_DoLog EXTRA "Building ncurses" CT_DoExecLog ALL make ${JOBSFLAGS} + + # STRIPPROG is handled by our wrapper around install. CT_DoLog EXTRA "Installing ncurses" - CT_DoExecLog ALL make "${install_target}" + CT_DoExecLog ALL \ + STRIPPROG="${host}-strip" \ + make "${install_target}" } fi |