diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-15 12:44:26 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-03-15 12:44:26 +0000 |
| commit | e1d4697bc4af580c8bbdb8256fdc90626e18a226 (patch) | |
| tree | 99c4cf49c4ba57d83bb03512bce0a89a0ac9d9f3 /subr/ex_pkg_exec.subr | |
| parent | b6a9a1a3c8b98077cce47d579069c42080d17da5 (diff) | |
| download | midipix_build-e1d4697bc4af580c8bbdb8256fdc90626e18a226.tar.bz2 midipix_build-e1d4697bc4af580c8bbdb8256fdc90626e18a226.tar.xz | |
Set -o nounset in addition to +o errexit -o nounset.
groups/000.host_tools.group:libtool_host:${PKG_LIBTOOL}: build w/ `none'.
subr/build_init.subr:buildp_init_getopts(): set ${DEFAULT_BUILD_CPUS} prior to ex_pkg_load_vars() call.
subr/pkg_{build,install_make}.subr: only pass `LIBTOOL=${PKG_LIBTOOL}' if set and not `none'.
vars/libtool_host.vars: removes obsolete vars file.
Diffstat (limited to 'subr/ex_pkg_exec.subr')
| -rw-r--r-- | subr/ex_pkg_exec.subr | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr index 4519ce25..d21289b7 100644 --- a/subr/ex_pkg_exec.subr +++ b/subr/ex_pkg_exec.subr @@ -1,5 +1,5 @@ # -# set +o errexit -o noglob is assumed. +# set +o errexit -o noglob -o nounset is assumed. # exp_pkg_exec_filter_vars_fn() { @@ -27,9 +27,9 @@ exp_pkg_exec_filter_vars_fn() { # exp_pkg_exec_pre() { local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}"; - if [ -z "${PKG_URL}" ]\ - && [ -z "${PKG_URLS_GIT}" ]\ - && [ -z "${PKG_VERSION}" ]\ + if [ -z "${PKG_URL:-}" ]\ + && [ -z "${PKG_URLS_GIT:-}" ]\ + && [ -z "${PKG_VERSION:-}" ]\ && ! rtl_test_cmd "pkg_${_pkg_name}_all"; then "${_dispatch_fn}" missing_pkg "${_group_name}" "${_pkg_name}"; return 1; @@ -94,7 +94,7 @@ ex_pkg_exec() { "pkg_${_pkg_name}_all" "${_restart_at}"; _rc="${?}"; else set -- ${PKG_BUILD_STEPS}; while [ ${#} -gt 0 ]; do - _step="${1}"; _step_next="${2}"; shift; + _step="${1}"; _step_next="${2:-}"; shift; if [ "${ARG_DUMP_IN}" = "${_step}" ]; then printf "" > "${BUILD_WORKDIR}/${_pkg_name}.dump"; rtl_filter_vars exp_pkg_exec_filter_vars_fn >> "${BUILD_WORKDIR}/${_pkg_name}.dump"; |