From 570129106f694bef52e07a5fc08f6c63f7f54073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 30 Jan 2017 18:50:20 +0000 Subject: build.sh: 2nd refactoring pt. I. build/{gcc,musl}.*.build: refactored into vars/{gcc,musl}.*.build. build/pkg.build: merged w/ build.sh (structurally) and refactored into subr/pkg_*.subr (implementations.) patches/gcc_native_x86_64_w64_mingw32.local.patch: fix wrong filename. subr/build.subr: merges source_scripts() into build.sh. subr/pkg.subr: accept either of ${PKG_..._{URL,VERSION}} when checking for missing entries in var/build.vars. vars/build.vars: adds vars for {gcc,musl}_*. vars/psxstub.vars: convert to pkg_..._all(); call pkg_fetch(). --- subr/build.subr | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'subr/build.subr') diff --git a/subr/build.subr b/subr/build.subr index 1f67257c..3020a002 100644 --- a/subr/build.subr +++ b/subr/build.subr @@ -121,23 +121,6 @@ init_build_vars() { BUILD_TIMES_SECS=$(command date +%s); }; -source_scripts() { - _ss_pkg_name="${BUILD_PACKAGE_LC%.*}"; - _ss_arg1="${BUILD_PACKAGE_LC#*.}"; - _ss_arg1="${_ss_arg1%%.*}"; - _ss_arg2="${BUILD_PACKAGE_LC##*.}"; - set -- ${_ss_pkg_name} ${_ss_arg1} ${_ss_arg2}; - for SCRIPT_SOURCE in vars/${BUILD_PACKAGE_LC}.vars ${BUILD_SCRIPT_FNAME}; do - if [ -f ${MIDIPIX_BUILD_PWD}/${SCRIPT_SOURCE} ]; then - if [ ${ARG_DRYRUN:-0} -eq 1 ]; then - echo . ${MIDIPIX_BUILD_PWD}/${SCRIPT_SOURCE}; - else - . ${MIDIPIX_BUILD_PWD}/${SCRIPT_SOURCE}; - fi; - fi; - done; -}; - source_vars() { for __ in ${HOME}/midipix_build.vars ../midipix_build.vars ./vars/build.vars; do [ -e ${__} ] && . ${__}; -- cgit v1.2.3