diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-16 16:29:27 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-16 16:29:27 +0000 |
| commit | 8cd21c85a1b5b5bb7a86d30698d94529d8fcb87f (patch) | |
| tree | 6aa7ab1b9ececb0dee0c7ed516a1dbcdb9c1e7b3 /mk/patch | |
| parent | 5b6205850d25cb6cdb0b12d0274e0bee25388bd8 (diff) | |
| download | pkgsrc-8cd21c85a1b5b5bb7a86d30698d94529d8fcb87f.tar.gz | |
Allow for emulation-specific patches for binary-only packages. The
patches are named emul-${EMUL_PLATFORM}-patch-* and are located in
${PATCHDIR}.
Diffstat (limited to 'mk/patch')
| -rw-r--r-- | mk/patch/bsd.patch-vars.mk | 4 | ||||
| -rw-r--r-- | mk/patch/patch.mk | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mk/patch/bsd.patch-vars.mk b/mk/patch/bsd.patch-vars.mk index 8df24b6afdb..b34d9a2d2b2 100644 --- a/mk/patch/bsd.patch-vars.mk +++ b/mk/patch/bsd.patch-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.patch-vars.mk,v 1.5 2007/08/13 09:22:21 rillig Exp $ +# $NetBSD: bsd.patch-vars.mk,v 1.6 2007/08/16 16:29:27 jlam Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -27,7 +27,7 @@ PATCHFILES?= # none -pkgsrc_patches= ${:!echo ${PATCHDIR}/patch-*!:N*\*} +pkgsrc_patches= ${:!echo ${PATCHDIR}/patch-* ${PATCHDIR}/emul-*-patch-*!:N*\*} local_patches= ${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*} .if !empty(PATCHFILES) || !empty(pkgsrc_patches) || !empty(local_patches) diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk index 4bb0a685f63..1ff9af10091 100644 --- a/mk/patch/patch.mk +++ b/mk/patch/patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: patch.mk,v 1.14 2007/08/15 13:56:25 jlam Exp $ +# $NetBSD: patch.mk,v 1.15 2007/08/16 16:29:27 jlam Exp $ # # The following variables may be set in a package Makefile and control # how pkgsrc patches are applied. @@ -256,6 +256,9 @@ do-distribution-patch: .if defined(PATCHDIR) && exists(${PATCHDIR}) _PKGSRC_PATCHES+= ${PATCHDIR}/patch-* +. if defined(EMUL_PLATFORM) +_PKGSRC_PATCHES+= ${PATCHDIR}/emul-${EMUL_PLATFORM}-patch-* +. endif .endif .if defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH}) _PKGSRC_PATCHES+= ${LOCALPATCHES}/${PKGPATH}/* @@ -282,7 +285,7 @@ do-pkgsrc-patch: ;; \ ${PATCHDIR}/patch-local-*) \ ;; \ - ${PATCHDIR}/patch-*) \ + ${PATCHDIR}/patch-*|${PATCHDIR}/emul-*-patch-*) \ if ${TEST} ! -f ${DISTINFO_FILE:Q}; then \ patch_warning "Ignoring patch file $$i: distinfo not found"; \ continue; \ |