diff options
| author | rillig <rillig@pkgsrc.org> | 2018-04-27 20:16:36 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2018-04-27 20:16:36 +0000 |
| commit | ceaa2e8ea0e6a2f7fd597ebca53c772c8ca3f115 (patch) | |
| tree | 8cc3dd6f7f2dc4383bad9cfd8546f1a491681824 | |
| parent | a762154eaea41ee83daa3b509bcb2ea4cebf8499 (diff) | |
| download | pkgsrc-ceaa2e8ea0e6a2f7fd597ebca53c772c8ca3f115.tar.gz | |
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.
| -rw-r--r-- | mk/tools/create.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/tools/create.mk b/mk/tools/create.mk index 26597b5c40c..13b5773039f 100644 --- a/mk/tools/create.mk +++ b/mk/tools/create.mk @@ -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_}= \ |