diff options
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/build_init.subr | 4 | ||||
| -rw-r--r-- | subr/ex_pkg.subr | 4 | ||||
| -rw-r--r-- | subr/ex_pkg_env.subr | 4 | ||||
| -rw-r--r-- | subr/pkg_install_files.subr | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/subr/build_init.subr b/subr/build_init.subr index af9a0a8e..35551668 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -144,7 +144,7 @@ buildp_init_files() { buildp_init_getopts() { local _arg="" _opt="" _rc=0 _shiftfl=0 OPTIND=0; _status=""; - : ${ARCH:="nt64"}; : ${BUILD:="debug"}; + : ${ARCH:="nt64"}; : ${BUILD_KIND:="debug"}; ARG_AS_NEEDED=0; ARG_CLEAN_BUILDS=""; ARG_DEBUG_MINIPIX=0; ARG_DIST=""; ARG_DUMP_IN=""; ARG_DUMP_ON_ABORT=0; ARG_FETCH_FORCE=0; ARG_PARALLEL=1; ARG_RELAXED=0; ARG_RESTART=""; ARG_RESTART_AT=""; ARG_RESTART_RECURSIVE=""; ARG_VERBOSE=0; @@ -171,7 +171,7 @@ buildp_init_getopts() { elif getopts a:b:C:D:Fhp:Pr:R _opt; then case "${_opt}" in a) ARCH="${OPTARG}"; ;; - b) BUILD="${OPTARG}"; ;; + b) BUILD_KIND="${OPTARG}"; ;; C) ARG_CLEAN_BUILDS="${OPTARG}"; ;; D) ARG_DIST="${OPTARG}"; ;; F) ARG_FETCH_FORCE=1; ;; diff --git a/subr/ex_pkg.subr b/subr/ex_pkg.subr index 8de0774e..8e7451d7 100644 --- a/subr/ex_pkg.subr +++ b/subr/ex_pkg.subr @@ -106,8 +106,8 @@ ex_pkg_load_vars() { local _rc=0; _status=""; if ! rtl_lmatch "${ARCH}" "nt32 nt64"; then _rc=1; _status="Error: invalid architecture \`${ARCH}'."; - elif ! rtl_lmatch "${BUILD}" "debug release"; then - _rc=1; _status="Error: unknown build type \`${BUILD}'."; + elif ! rtl_lmatch "${BUILD_KIND}" "debug release"; then + _rc=1; _status="Error: unknown build type \`${BUILD_KIND}'."; else case "${ARCH}" in nt32) DEFAULT_TARGET="i686-nt32-midipix"; ;; nt64) DEFAULT_TARGET="x86_64-nt64-midipix"; ;; diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index 2e4615a3..2f2f674c 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -66,11 +66,11 @@ exp_pkg_env_set() { if [ -n "${PKG_INHERIT_FROM:-}" ]; then rtl_set_vars _vars_set "${_vname}" \ "$(rtl_lconcat "${_var_prefixes}" \ - "$(rtl_toupper "PKG_${PKG_INHERIT_FROM} PKG_${PKG_INHERIT_FROM}_${BUILD} PKG_${_pkg_name} PKG_${_pkg_name}_${BUILD}")")"; + "$(rtl_toupper "PKG_${PKG_INHERIT_FROM} PKG_${PKG_INHERIT_FROM}_${BUILD_KIND} PKG_${_pkg_name} PKG_${_pkg_name}_${BUILD_KIND}")")"; else rtl_set_vars _vars_set "${_vname}" \ "$(rtl_lconcat "${_var_prefixes}" \ - "$(rtl_toupper "PKG_${_pkg_name} PKG_${_pkg_name}_${BUILD}")")"; + "$(rtl_toupper "PKG_${_pkg_name} PKG_${_pkg_name}_${BUILD_KIND}")")"; fi; done; IFS0="${IFS:- }"; IFS=":"; for _vname in ${PKG_ENV_VARS_EXTRA:-}; do diff --git a/subr/pkg_install_files.subr b/subr/pkg_install_files.subr index 76460da3..55d79cba 100644 --- a/subr/pkg_install_files.subr +++ b/subr/pkg_install_files.subr @@ -25,7 +25,7 @@ pkgp_install_files_pkgconfig() { pkgp_install_files_strip() { local _bin_path="" _tree_root="${PKG_DESTDIR}"; if [ -e "${_tree_root}" ]\ - && [ "${BUILD}" = release ]\ + && [ "${BUILD_KIND}" = release ]\ && [ "${PKG_BUILD_TYPE}" = native ]; then if [ "${PKG_NAME%_minipix}" != "${PKG_NAME}" ]\ && [ "${ARG_DEBUG_MINIPIX:-0}" -eq 1 ]; then |