ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-02-21 09:21:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add --disable-database and --with-fallbacks separately

Browse Source 
The dependency between them has been removed in Kconfig.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-02-17 12:07:39 -08:00
parent eb8c9024b4
commit a417c31875
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,10 @@ do_ncurses_for_build() {
case "${CT_TOOLCHAIN_TYPE}" in case "${CT_TOOLCHAIN_TYPE}" in
native|cross) native|cross)
if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" ) opts+=( "--disable-database" )
fi
if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
fi fi
opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" ) opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
;; ;;
@ -73,7 +76,10 @@ do_ncurses_for_host() {
"--without-cxx-binding" \ "--without-cxx-binding" \
"--without-ada" ) "--without-ada" )
if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" ) opts+=( "--disable-database" )
fi
if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
fi fi
opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" ) opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
do_ncurses_backend host="${CT_HOST}" \ do_ncurses_backend host="${CT_HOST}" \
@ -96,7 +102,10 @@ do_ncurses_for_target() {
[ "${CT_CC_LANG_CXX}" = "y" ] || opts+=("--without-cxx" "--without-cxx-binding") [ "${CT_CC_LANG_CXX}" = "y" ] || opts+=("--without-cxx" "--without-cxx-binding")
[ "${CT_CC_LANG_ADA}" = "y" ] || opts+=("--without-ada") [ "${CT_CC_LANG_ADA}" = "y" ] || opts+=("--without-ada")
if [ "${CT_NCURSES_TARGET_DISABLE_DB}" = "y" ]; then if [ "${CT_NCURSES_TARGET_DISABLE_DB}" = "y" ]; then
opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_TARGET_FALLBACKS}" ) opts+=( "--disable-database" )
fi
if [ -n "${CT_NCURSES_TARGET_FALLBACKS}" ]; then
opts+=( "--with-fallbacks=${CT_NCURSES_TARGET_FALLBACKS}" )
fi fi
opts+=( "${CT_NCURSES_TARGET_CONFIG_ARGS[@]}" ) opts+=( "${CT_NCURSES_TARGET_CONFIG_ARGS[@]}" )
case "${CT_TARGET}" in case "${CT_TARGET}" in