From 8eef20de06b05383c4c9b0df7a81a25ecb178270 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 18 Jan 2006 03:58:19 +0000
Subject: Pass MAKEFLAGs to the depends-depth-first.awk script, which will be
 used by the "make show-depends-pkgpaths" process to short-circuit some of the
 rather lengthy computations that are spread throughout bsd.pkg.mk and files
 included by bsd.pkg.mk.  This causes the script to speed up noticeably.

Also, rename the _DEPENDS_DEPTH_FIRST_CMD variable to _DEPENDS_WALK_CMD
for brevity and to allow for other implementations in the future.
---
 mk/bsd.utils.mk                    | 10 ++++++----
 mk/scripts/depends-depth-first.awk |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mk/bsd.utils.mk b/mk/bsd.utils.mk
index 694ed613f4b..de843e3d326 100644
--- a/mk/bsd.utils.mk
+++ b/mk/bsd.utils.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.utils.mk,v 1.1 2006/01/18 00:10:07 jlam Exp $
+# $NetBSD: bsd.utils.mk,v 1.2 2006/01/18 03:58:19 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines utility
 # and otherwise miscellaneous variables and targets.
@@ -25,10 +25,12 @@ show-depends-pkgpaths:
 	@${ECHO} ${_deppath_}
 .endfor
 
-# _DEPENDS_DEPTH_FIRST_CMD holds the command (sans arguments) to traverse
-# the dependency graph for a package.
+# _DEPENDS_WALK_CMD holds the command (sans arguments) to walk the
+# dependency graph for a package.
 #
-_DEPENDS_DEPTH_FIRST_CMD=						\
+_DEPENDS_WALK_MAKEFLAGS?=	${MAKEFLAGS}
+_DEPENDS_WALK_CMD=							\
 	${SETENV} ECHO=${TOOLS_ECHO:Q} MAKE=${MAKE:Q}			\
+		MAKEFLAGS=${_DEPENDS_WALK_MAKEFLAGS:Q}			\
 		PKGSRCDIR=${PKGSRCDIR:Q} TEST=${TOOLS_TEST:Q}		\
 	${AWK} -f ${.CURDIR}/../../mk/scripts/depends-depth-first.awk --
diff --git a/mk/scripts/depends-depth-first.awk b/mk/scripts/depends-depth-first.awk
index 87ef4c3e25e..087a8cad7e1 100755
--- a/mk/scripts/depends-depth-first.awk
+++ b/mk/scripts/depends-depth-first.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: depends-depth-first.awk,v 1.1 2006/01/18 00:10:07 jlam Exp $
+# $NetBSD: depends-depth-first.awk,v 1.2 2006/01/18 03:58:19 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -82,6 +82,11 @@
 #			value stored in the PKGSRCDIR environment variable.
 #
 # ENVIRONMENT
+#
+#	MAKEFLAGS	This contains the shell environment in the format
+#			required by make(1) that is passed to the process
+#			that outputs a package's dependencies.
+#
 #	PKGSRCDIR	This is the location of the pkgsrc directory tree,
 #			which defaults to "/usr/pkgsrc".
 #
-- 
cgit v1.2.3