diff options
author | Alexey Neyman <stilor@att.net> | 2017-02-17 20:07:39 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2017-02-17 20:07:39 (GMT) |
commit | a417c3187552f75df9db707bc99c8fa1f12d6a3b (patch) | |
tree | ece15b505c714d4e27b439f90a1725da45de58c2 /scripts/build/companion_libs | |
parent | eb8c9024b4fe51925aff3d8d158188a97034a445 (diff) |
Add --disable-database and --with-fallbacks separately
The dependency between them has been removed in Kconfig.
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 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index 962e8ad..573523b 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -39,7 +39,10 @@ do_ncurses_for_build() { case "${CT_TOOLCHAIN_TYPE}" in native|cross) 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 opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" ) ;; @@ -73,7 +76,10 @@ do_ncurses_for_host() { "--without-cxx-binding" \ "--without-ada" ) 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 opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" ) 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_ADA}" = "y" ] || opts+=("--without-ada") 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 opts+=( "${CT_NCURSES_TARGET_CONFIG_ARGS[@]}" ) case "${CT_TARGET}" in |