pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/tools Use a temporary variable to hold ${_dep_:C/\:...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/076176de852e
branches:  trunk
changeset: 552035:076176de852e
user:      dsl <dsl%pkgsrc.org@localhost>
date:      Tue Dec 23 22:34:26 2008 +0000

description:
Use a temporary variable to hold ${_dep_:C/\:.*$//} since it is used
as a modifier on another variable and would need to be escaped
as :M${_dep_\:C/\\\:.*$//} in order for the modifiers to be parsed correctly.
This all used to work because _dep_ is a .for loop control variable which
was substituted in an earlier pass through the line.
Recent changes leave .for loop control variables to be substituted during
normal expansion.
Adding the \ would leave the script non-working with theolder make.

OK'd by Beefy

diffstat:

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

diffs (19 lines):

diff -r 1fdeb3eeda3c -r 076176de852e mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Dec 23 22:22:16 2008 +0000
+++ b/mk/tools/replace.mk       Tue Dec 23 22:34:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.216 2008/12/15 12:53:28 rillig Exp $
+# $NetBSD: replace.mk,v 1.217 2008/12/23 22:34:26 dsl Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1249,7 +1249,8 @@
 #####
 .    if defined(_TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
 .      for _dep_ in ${TOOLS_DEPENDS.${_t_}}
-.        if empty(${_TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_:C/\:.*$//})
+_dep_test := ${_dep_:C/\:.*$//}
+.        if empty(${_TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_test})
 ${_TOOLS_DEPMETHOD.${_t_}}+=   ${_dep_}
 .        endif
 .      endfor



Home | Main Index | Thread Index | Old Index