diff options
Diffstat (limited to 'subr/pkg_patch.subr')
| -rw-r--r-- | subr/pkg_patch.subr | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index 089c0c16..63e1b450 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -1,30 +1,26 @@ # -# . ./build.vars and set -o errexit -o noglob are assumed. -# See warning at the top of build.vars. +# set -o errexit -o noglob are assumed. # pkg_patch() { + local _patch_fname; if [ -d ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME} ]; then set +o noglob; - for __patch_fname in ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch; do - patch -b -d ${PKG_SUBDIR} -p1 < ${__patch_fname}; + for _patch_fname in ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch; do + patch -b -d ${PKG_SUBDIR} -p1 < ${_patch_fname}; done; set -o noglob; fi; - for __patch_fname in \ + for _patch_fname in \ ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}.local.patch \ ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch; do - if [ -r "${__patch_fname}" ]; then - patch -b -d ${PKG_SUBDIR} -p1 < ${__patch_fname}; + if [ -r "${_patch_fname}" ]; then + patch -b -d ${PKG_SUBDIR} -p1 < ${_patch_fname}; fi; - done; unset __patch_fname; - if test_cmd pkg_${PKG_NAME}_patch_post; then - pkg_${PKG_NAME}_patch_post; - fi; - set_build_script_done patch -setup; + done; }; # vim:filetype=sh |