diff options
| author | sketch <sketch> | 2008-06-09 14:47:03 +0000 |
|---|---|---|
| committer | sketch <sketch> | 2008-06-09 14:47:03 +0000 |
| commit | 6c80c06fd5e2dd34025e4618aad44ab6811e80eb (patch) | |
| tree | b35aa9a99b5d02952522edd05e6e48a3f2ba2ff9 /mk/patch | |
| parent | 663aa4a10a6deca9b672c81bf6dae6036c6a40f7 (diff) | |
| download | pkgsrc-6c80c06fd5e2dd34025e4618aad44ab6811e80eb.tar.gz | |
Wrap expansion of local patches inside LOCALPATCHES, given that it is undefined
by default. Previous behaviour would try to echo /<pkgpath> which leads to
interesting behaviour when /net is an autofs map...
Reduces runtime of mk/bulk/printdepends by 5.25 days on my test system.
Diffstat (limited to 'mk/patch')
| -rw-r--r-- | mk/patch/bsd.patch-vars.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/patch/bsd.patch-vars.mk b/mk/patch/bsd.patch-vars.mk index b34d9a2d2b2..43707b28799 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.6 2007/08/16 16:29:27 jlam Exp $ +# $NetBSD: bsd.patch-vars.mk,v 1.7 2008/06/09 14:47:03 sketch Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -28,7 +28,9 @@ PATCHFILES?= # none pkgsrc_patches= ${:!echo ${PATCHDIR}/patch-* ${PATCHDIR}/emul-*-patch-*!:N*\*} +.if !empty(LOCALPATCHES) local_patches= ${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*} +.endif .if !empty(PATCHFILES) || !empty(pkgsrc_patches) || !empty(local_patches) USE_TOOLS+= patch |