summaryrefslogtreecommitdiffhomepage
path: root/subr
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-12 00:03:06 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-12 00:03:06 +0000
commit1eec19a5bbee231477e7a2024119a53ff7b8dd8c (patch)
treebc73173fb1120032b6caafdc14ee3793b22b8b30 /subr
parent8911a67c14b85249d9f9091c107d577dce14a2e9 (diff)
downloadmidipix_build-1eec19a5bbee231477e7a2024119a53ff7b8dd8c.tar.bz2
midipix_build-1eec19a5bbee231477e7a2024119a53ff7b8dd8c.tar.xz
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.
Diffstat (limited to 'subr')
-rw-r--r--subr/ex_pkg_dispatch.subr8
1 files changed, 4 insertions, 4 deletions
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;
};