diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildhlp.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index d4c8eeb50..4df712fcb 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -56,8 +56,10 @@ endif ifeq ($(strip ${__use_generic_patch_target}),42) post-patch: ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done + [ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ + '{patch-!(*.orig),*.patch}' [ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ - '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) + '{patch-!(*.orig),*.patch}' [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ $(MAKE_TRACE) @${MAKE} post-patch $(MAKE_TRACE) diff --git a/mk/vars.mk b/mk/vars.mk index fdd9f432c..6f38db944 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -102,7 +102,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | cpio -i -d ;; \ + cat $$file | $(STAGING_TOOLS)/bin/cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ @@ -114,7 +114,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ - unzip -qd ${WRKDIR} $$file ;; \ + cat $$file | $(STAGING_TOOLS)/bin/cpio -ivd -H zip ;; \ *.arm) \ cp $$file ${WRKDIR} ;; \ *) \ |