summaryrefslogtreecommitdiffhomepage
path: root/subr/pkg_patch.subr
diff options
context:
space:
mode:
Diffstat (limited to 'subr/pkg_patch.subr')
-rw-r--r--subr/pkg_patch.subr26
1 files changed, 14 insertions, 12 deletions
diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr
index 3730395c..de32fe30 100644
--- a/subr/pkg_patch.subr
+++ b/subr/pkg_patch.subr
@@ -4,23 +4,25 @@
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 "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}";
- done;
- set -o noglob;
- fi;
+ set +o noglob;
for _patch_fname in \
- ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local.patch \
- ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${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
+ ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local.patch \
+ ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local.patch \
+ ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \
+ ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local@${BUILD_HNAME}.patch \
+ ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \
+ ${WORKDIR}/chainport/${PKG_NAME}.midipix.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local@${BUILD_HNAME}.patch; do
if [ -r "${_patch_fname}" ]; then
patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}";
fi;
done;
+ set -o noglob;
};
# vim:filetype=sh