From 7a66564fb73f8f9ab35d308d774f07306402467e 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: Wed, 22 Nov 2017 02:11:09 +0000 Subject: 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. --- subr/pkg_configure_patch_pre.subr | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'subr/pkg_configure_patch_pre.subr') 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; -- cgit v1.2.3