ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-31 08:25:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always build ncurses-for-build

Browse Source 
If the build machine lacks tic, we need to build it in the first pass
even if host==build: ncurses Makefiles are not smart enough to build
'tic' first and use the just-built tic to compile fallback terminfo.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-04-01 19:17:31 -07:00
parent 8aab163232
commit 91c192e318
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/build/companion_libs/220-ncurses.sh
View File

@ -31,26 +31,13 @@ do_ncurses_for_build() {
"--without-tests" \ "--without-tests" \
"--without-cxx" \ "--without-cxx" \
"--without-cxx-binding" \ "--without-cxx-binding" \
"--without-ada") "--without-ada" \
# If we are not canadian, this is also our host curses "--without-fallbacks" )
# Unlike other companion libs, we skip host build if build==host
# (i.e. in simple cross or native): ncurses may not be needed for
# host, but we still need them on build to produce 'tic'.
case "${CT_TOOLCHAIN_TYPE}" in
native|cross)
if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
opts+=( "--disable-database" )
fi
if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
fi
opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
;;
esac
do_ncurses_backend host="${CT_BUILD}" \ do_ncurses_backend host="${CT_BUILD}" \
destdir="${CT_BUILDTOOLS_PREFIX_DIR}" \ destdir="${CT_BUILDTOOLS_PREFIX_DIR}" \
cflags="${CT_CFLAGS_FOR_BUILD}" \ cflags="${CT_CFLAGS_FOR_BUILD}" \
ldflags="${CT_LDFLAGS_FOR_BUILD}" \ ldflags="${CT_LDFLAGS_FOR_BUILD}" \
install_target=install.progs \
"${opts[@]}" "${opts[@]}"
CT_Popd CT_Popd
CT_EndStep CT_EndStep
@ -60,13 +47,6 @@ if [ "${CT_NCURSES}" = "y" ]; then
do_ncurses_for_host() { do_ncurses_for_host() {
local -a opts local -a opts
# Unlike other companion libs, we skip host build if build==host
# (i.e. in simple cross or native): ncurses may not be needed for
# host, but we still need them on build to produce 'tic'.
case "${CT_TOOLCHAIN_TYPE}" in
native|cross) return 0;;
esac
CT_DoStep INFO "Installing ncurses for host" CT_DoStep INFO "Installing ncurses for host"
CT_mkdir_pushd "${CT_BUILD_DIR}/build-ncurses-host-${CT_HOST}" CT_mkdir_pushd "${CT_BUILD_DIR}/build-ncurses-host-${CT_HOST}"
opts=("--enable-symlinks" \ opts=("--enable-symlinks" \
@ -142,7 +122,7 @@ do_ncurses_backend() {
local ldflags local ldflags
local shared local shared
local arg local arg
local for_target local install_target=install
for arg in "$@"; do for arg in "$@"; do
case "$arg" in case "$arg" in
@ -198,7 +178,7 @@ do_ncurses_backend() {
CT_DoLog EXTRA "Building ncurses" CT_DoLog EXTRA "Building ncurses"
CT_DoExecLog ALL make ${JOBSFLAGS} CT_DoExecLog ALL make ${JOBSFLAGS}
CT_DoLog EXTRA "Installing ncurses" CT_DoLog EXTRA "Installing ncurses"
CT_DoExecLog ALL make install CT_DoExecLog ALL make "${install_target}"
} }
fi fi