summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2018-04-27 20:53:14 +0000
committerrillig <rillig@pkgsrc.org>2018-04-27 20:53:14 +0000
commit7e24cc24c14bf6414e98cd3d4efe2b5bb96708b6 (patch)
tree0afd994a464c99a73361c0f785f1a1a67c3191e0 /mk
parent7618afa8a2fdc1e656be045b18672a0f3e5c5300 (diff)
downloadpkgsrc-7e24cc24c14bf6414e98cd3d4efe2b5bb96708b6.tar.gz
mk/tools/create.mk: revert filtering duplicate tool names
The "split" program is not managed by the tools framework. It just has a wrapper that is placed into the same directory. This is confusing since intuitively, "split" is a tool like many others. The "duplicate script for target" warning from Make is therefore correct, albeit obscure. Currently, neither the pkgsrc infrastructure nor pkglint check for allowed tool names.
Diffstat (limited to 'mk')
-rw-r--r--mk/tools/create.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/tools/create.mk b/mk/tools/create.mk
index 13b5773039f..579a85774f8 100644
--- a/mk/tools/create.mk
+++ b/mk/tools/create.mk
@@ -1,4 +1,4 @@
-# $NetBSD: create.mk,v 1.6 2018/04/27 20:16:36 rillig Exp $
+# $NetBSD: create.mk,v 1.7 2018/04/27 20:53:14 rillig Exp $
#
# Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -139,7 +139,7 @@ MKDIR?= mkdir -p
# by any arguments specified in TOOLS_ARGS.*, followed by any
# command-line arguments passed to the wrapper script.
#
-.for _t_ in ${TOOLS_CREATE:O:u}
+.for _t_ in ${TOOLS_CREATE}
TOOLS_CMD.${_t_}?= ${TOOLS_DIR}/bin/${_t_}
TOOLS_PATH.${_t_}?= ${FALSE}
TOOLS_SCRIPT_DFLT.${_t_}= \
@@ -147,6 +147,9 @@ TOOLS_SCRIPT_DFLT.${_t_}= \
override-tools: ${TOOLS_CMD.${_t_}}
+# Note: if you get a warning about a doubly-defined target here, you are
+# probably adding a program to USE_TOOLS that is not a valid tool name.
+# For instance, "split" is handled outside of the tools framework.
${TOOLS_CMD.${_t_}}:
${RUN} ${TEST} -d ${.TARGET:H:Q} || ${MKDIR} ${.TARGET:H:Q}
${RUN} \