pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/tools mk/tools/create.mk: revert filte...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b7e1bf65862
branches:  trunk
changeset: 306849:0b7e1bf65862
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Apr 27 20:53:14 2018 +0000
description:
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:

 mk/tools/create.mk |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r a7cd52f3a0c5 -r 0b7e1bf65862 mk/tools/create.mk
--- a/mk/tools/create.mk        Fri Apr 27 20:37:47 2018 +0000
+++ b/mk/tools/create.mk        Fri Apr 27 20:53:14 2018 +0000
@@ -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 @@
 # 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 @@
 
 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}                                                          \



Home | Main Index | Thread Index | Old Index