CVS commit: pkgsrc/mk/tools

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Apr 27 20:16:36 UTC 2018

Modified Files:
        pkgsrc/mk/tools: create.mk

Log Message:
mk/tools/create.mk: sort tools before creating the wrapper targets

The TOOLS_CREATE variable is only ever appended to, without checking for
duplicates. In some rare cases, this produces warnings about
doubly-defined make targets. An example is adding USE_TOOLS+=strip to
pkgtools/pkglint:

".../mk/tools/create.mk" line 149: warning:
    duplicate script for target ".../work/.tools/bin/strip" ignored

The above line number 149 is zero-based, which in reality means the
duplicate definition is in line 150.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/tools/create.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/tools/create.mk
diff -u pkgsrc/mk/tools/create.mk:1.5 pkgsrc/mk/tools/create.mk:1.6
--- pkgsrc/mk/tools/create.mk:1.5       Wed Feb 27 12:09:39 2013
+++ pkgsrc/mk/tools/create.mk   Fri Apr 27 20:16:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: create.mk,v 1.5 2013/02/27 12:09:39 obache Exp $
+# $NetBSD: create.mk,v 1.6 2018/04/27 20:16:36 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}
+.for _t_ in ${TOOLS_CREATE:O:u}
 TOOLS_CMD.${_t_}?=             ${TOOLS_DIR}/bin/${_t_}
 TOOLS_PATH.${_t_}?=            ${FALSE}
 TOOLS_SCRIPT_DFLT.${_t_}=      \