pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/patch Wrap expansion of local patches inside LOCALP...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c84190add80
branches:  trunk
changeset: 543219:0c84190add80
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Mon Jun 09 14:47:03 2008 +0000

description:
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:

 mk/patch/bsd.patch-vars.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 126e49ed6650 -r 0c84190add80 mk/patch/bsd.patch-vars.mk
--- a/mk/patch/bsd.patch-vars.mk        Mon Jun 09 14:33:49 2008 +0000
+++ b/mk/patch/bsd.patch-vars.mk        Mon Jun 09 14:47:03 2008 +0000
@@ -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



Home | Main Index | Thread Index | Old Index