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: sort tools b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fe8c40fffa3
branches:  trunk
changeset: 306845:4fe8c40fffa3
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Apr 27 20:16:36 2018 +0000
description:
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.

diffstat:

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

diffs (18 lines):

diff -r bf423f5dea8b -r 4fe8c40fffa3 mk/tools/create.mk
--- a/mk/tools/create.mk        Fri Apr 27 17:48:39 2018 +0000
+++ b/mk/tools/create.mk        Fri Apr 27 20:16:36 2018 +0000
@@ -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 @@
 # 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_}=      \



Home | Main Index | Thread Index | Old Index