diff options
| author | jlam <jlam> | 2005-04-30 04:35:54 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-04-30 04:35:54 +0000 |
| commit | b7debf04590429cafbec4354a5453131c951d9d9 (patch) | |
| tree | b67d09c94bf8378182c0cc312e8b699b6567deee /mk/bsd.prefs.mk | |
| parent | 87a458dbe4f7e20bb174d0ddd5a63060c9f15726 (diff) | |
| download | pkgsrc-b7debf04590429cafbec4354a5453131c951d9d9.tar.gz | |
Split replace.mk into two parts, one of which is included by bsd.prefs.mk
to provide "TOOL" definitions for tools used by a top-level make process
(usually because it uses them in a != variable definition). This allows
USE_TOOLS to be defined before bsd.prefs.mk is included by a package
Makefile, where USE_TOOLS lists the additional (non-default) tools that
are required to build the package.
Also, drop the fallback to existing "TOOL" definitions because we now
have TOOLS_PLATFORM.* for each platform in pkgsr/mk/tools/tools.*.mk.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index b6f59163e87..96e6dc2d0d9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.184 2005/04/08 20:11:53 tv Exp $ +# $NetBSD: bsd.prefs.mk,v 1.185 2005/04/30 04:35:54 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -267,6 +267,19 @@ _PKGSRC_TOPDIR= ${.CURDIR}/../.. . include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf" .endif +# Provide default values for TOOLs used by the top-level make. +USE_TOOLS+= [ awk dirname echo grep pwd sed test true + +# These tools are used by the top-level make only in certain packages and +# should eventually be moved into those particular package Makefiles. +# +USE_TOOLS+= date expr find wc tr + +_USE_NEW_TOOLS?= no +.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS]) +.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk" +.endif + .if ${OPSYS} == "NetBSD" . if ${OBJECT_FMT} == "ELF" && \ (${MACHINE_GNU_ARCH} == "arm" || \ |