From d01c0269b8e5e467f82cd28392579c4c43fe63bc 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, 20 Nov 2017 15:27:06 +0000 Subject: subr/pkg_{autoconf,configure,patch}.subr: reference ${PKG_BASE_DIR} instead of ${WORKDIR}. subr/pkg_build_dir.subr: {build,install} packages nested within ${PKG_BUILD_DIR}/. subr/pkg_distclean.subr: removed from repository. subr/pkg_{extract,fetch}.subr: {extract,fetch} within ${PKG_BASE_DIR}. subr/pkg_install.subr: install to ../destdir to facilitate post-installation processing. subr/pkg_setup_env.subr: set & create ${PKG_BASE_DIR}. subr/pre_subdirs.subr: always create ${PREFIX}/bin. vars/build.vars: consistently use ${PKG_{PREFIX,MAKE_INSTALL_VNAME,MAKEFLAGS_INSTALL}}. vars/env.vars, *: cleanup. --- subr/pkg_patch.subr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'subr/pkg_patch.subr') diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index eba8f6f2..fadd1ed8 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -5,10 +5,10 @@ pkg_patch() { local _patch_fname _patches_done; set +o noglob; - for _patch_fname in \ - ${WORKDIR}/chainport/${PKG_NAME}.midipix.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ + for _patch_fname in \ + ${WORKDIR}/chainport-native-${PKG_TARGET}/chainport/${PKG_NAME}.midipix.patch \ + ${WORKDIR}/chainport-native-${PKG_TARGET}/chainport/${PKG_SUBDIR}.midipix.patch \ + ${WORKDIR}/chainport-native-${PKG_TARGET}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}/*.patch \ ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ @@ -20,7 +20,7 @@ pkg_patch() { ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch; do if ! lmatch "${_patches_done}" " " "${_patch_fname}"\ && [ -r "${_patch_fname}" ]; then - patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; + patch -b -d "${PKG_BASE_DIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; _patches_done="${_patches_done:+${_patches_done} }${_patch_fname}"; fi; done; -- cgit v1.2.3