summaryrefslogtreecommitdiffhomepage
path: root/subr/pkg_configure_patch_pre.subr
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-22 02:11:09 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-22 02:35:32 +0000
commit7a66564fb73f8f9ab35d308d774f07306402467e (patch)
tree4d2ed992ad59fef02cf3a69cf3ac7c6c17aace43 /subr/pkg_configure_patch_pre.subr
parent32ad217d197203a97dfcc0076e748731d2315c0b (diff)
downloadmidipix_build-7a66564fb73f8f9ab35d308d774f07306402467e.tar.bz2
midipix_build-7a66564fb73f8f9ab35d308d774f07306402467e.tar.xz
patches/*, subr/pkg_configure_patch{,_pre}.subr: only match against package {name,version}.
subr/pkg_configure_patch.subr: remove `_host' package name postfix when searching for chainport patches. subr/ex_pkg_env.subr: fix typo.
Diffstat (limited to 'subr/pkg_configure_patch_pre.subr')
-rw-r--r--subr/pkg_configure_patch_pre.subr8
1 files changed, 3 insertions, 5 deletions
diff --git a/subr/pkg_configure_patch_pre.subr b/subr/pkg_configure_patch_pre.subr
index d228bd83..6843a784 100644
--- a/subr/pkg_configure_patch_pre.subr
+++ b/subr/pkg_configure_patch_pre.subr
@@ -4,11 +4,9 @@
pkg_configure_patch_pre() {
local _patch_path;
- for _patch_path in \
- ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local.patch \
- ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch \
- ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local.patch \
- ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}_pre.local@${BUILD_HNAME}.patch; do
+ for _patch_path in \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}_pre.local.patch \
+ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}${PKG_VERSION:+-${PKG_VERSION}}_pre.local@${BUILD_HNAME}.patch; do
if [ -r "${_patch_path}" ]; then
patch -b -d "${PKG_BASE_DIR}/${PKG_SUBDIR}" -p1 < "${_patch_path}";
fi;