diff options
author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-11 17:09:12 +0000 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-11 17:09:12 +0000 |
commit | 8a04deff7e91795435db7b751352512f116c7aba (patch) | |
tree | 378077e96b475a733651627b4518c489b5f223ec /subr/ex_pkg_env.subr | |
parent | b969400ee0747a07b85fad554337efca46bd5908 (diff) | |
download | midipix_build-8a04deff7e91795435db7b751352512f116c7aba.tar.bz2 midipix_build-8a04deff7e91795435db7b751352512f116c7aba.tar.xz |
Implements package-package dependencies.
Diffstat (limited to 'subr/ex_pkg_env.subr')
-rw-r--r-- | subr/ex_pkg_env.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index cbfb6ecd..ef2166c2 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -15,7 +15,7 @@ exp_pkg_env_source() { _build_type_uc="$(ex_rtl_toupper "${PKG_BUILD_TYPE}")"; ex_rtl_set_vars INHERIT_FROM "PKG_${_pkg_name_uc}" _vars_set; _pkg_name_inherit_uc="$(ex_rtl_toupper "${PKG_INHERIT_FROM}")"; - for _vname_dst in $(ex_rtl_lfilter_not \ + for _vname_dst in $(ex_rtl_lfilter \ "${DEFAULT_BUILD_VARS}" BUILD_TYPE); do if [ -n "${_pkg_name_inherit_uc}" ]; then ex_rtl_set_vars "${_vname_dst}" \ @@ -30,7 +30,7 @@ exp_pkg_env_source() { _vars_set; fi; done; - ex_rtl_unset_vars $(ex_rtl_lfilter_not \ + ex_rtl_unset_vars $(ex_rtl_lfilter \ "$(set | awk -F= '/^PKG_/{print $1}' | sort)" \ "${_vars_set}"); }; @@ -42,7 +42,7 @@ ex_pkg_env() { : ${MIDIPIX_BUILD_PWD:="$(pwd)"}; : ${PKG_BASE_DIR:="${BUILD_WORKDIR}/${_pkg_name}-${PKG_BUILD_TYPE}-${PKG_TARGET}"}; : ${PKG_FNAME:="${PKG_URL##*/}"}; - : ${PKG_BUILD_STEPS:="$(ex_rtl_lfilter_not "${DEFAULT_BUILD_STEPS}" \ + : ${PKG_BUILD_STEPS:="$(ex_rtl_lfilter "${DEFAULT_BUILD_STEPS}" \ "${PKG_BUILD_STEPS_DISABLE}")"}; if [ -z "${PKG_SUBDIR}" ]; then if [ -n "${PKG_URLS_GIT}" ]; then |