From 1eec19a5bbee231477e7a2024119a53ff7b8dd8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Wed, 12 Feb 2020 00:03:06 +0000 Subject: vars/build.vars:{host,native}_toolchain: merges {host,native}_toolchain_mingw32. vars/build.vars:native_toolchain: fix group variables. vars/build.vars:ncurses: moved into native_packags_deps_deps. vars/build.vars:{bzip2,expat,lib{elf,ffi,readline,z}}: moved into native_packages_deps. vars/build.vars:{gdb,python2}: moved into native_packages. vars/gcc.vars: minor cleanup. etc/build.usage: updated. subr/ex_pkg_dispatch.subr: disable dependency expansion given -r. --- subr/ex_pkg_dispatch.subr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'subr/ex_pkg_dispatch.subr') diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index 255264fe..9d55ce56 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -8,8 +8,8 @@ exp_pkg_check_depends() { local _group_name="${1}" _pkg_depends="${2}" _pkg_name="${3}" _dependfl=0; - if [ -z "${_restart}" ]\ - || ! [ "$(ex_rtl_get_var_unsafe "$(ex_rtl_toupper "${_group_name}")_IN_TREE"))" = "1" ]; then + if ! [ -n "${_restart}" ]\ + && ! [ "$(ex_rtl_get_var_unsafe "$(ex_rtl_toupper "${_group_name}")_IN_TREE"))" = "1" ]; then for _pkg_name_depend in ${_pkg_depends}; do if [ -n "$(ex_rtl_lsearch "${_pkgs_wait}" "${_pkg_name_depend}")" ]\ || [ -z "$(ex_rtl_lsearch "${_pkgs_complete}" "${_pkg_name_depend}")" ]; then @@ -86,8 +86,8 @@ exp_pkg_get_packages() { && ! ex_rtl_lmatch "ALL LAST" " " "${_restart}"; then _pkg_names="$(ex_rtl_lsearch "${_pkg_names}" "${_restart}")"; fi; - if [ -z "${_restart}" ]\ - || ! [ "$(ex_rtl_get_var_unsafe "${_group_name_uc}"_IN_TREE)" = "1" ]; then + if ! [ -n "${_restart}" ]\ + && ! [ "$(ex_rtl_get_var_unsafe "${_group_name_uc}"_IN_TREE)" = "1" ]; then _pkg_names="$(ex_rtl_uniq $(exp_pkg_expand_packages ${_pkg_names}))"; fi; }; -- cgit v1.2.3