diff options
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/misc/show.mk | 4 | ||||
| -rw-r--r-- | regress/infra-unittests/show-all.sh | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index e10792f826a..6ab6df71aae 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.245 2020/07/01 07:39:52 rillig Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.246 2020/07/01 09:13:13 rillig Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -204,7 +204,7 @@ _BLNK_PACKAGES+= ${_pkg_} .endfor _VARGROUPS+= bl3 -_VARGROUPS_WIDTH.bl3= 39 +_VARGROUP_WIDTH.bl3= 39 _DEF_VARS.bl3+= _BLNK_PACKAGES _BLNK_DEPENDS _LISTED_VARS.bl3+= _BLNK_PACKAGES _BLNK_DEPENDS .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDADD LDFLAGS LIBS diff --git a/mk/misc/show.mk b/mk/misc/show.mk index 591f678d243..42188c230e1 100644 --- a/mk/misc/show.mk +++ b/mk/misc/show.mk @@ -1,4 +1,4 @@ -# $NetBSD: show.mk,v 1.21 2020/07/01 07:39:52 rillig Exp $ +# $NetBSD: show.mk,v 1.22 2020/07/01 09:13:12 rillig Exp $ # # This file contains some targets that print information gathered from # variables. They do not modify any variables. @@ -154,7 +154,7 @@ _LABEL._DEF_VARS= def show-all: .PHONY .for g in ${"${.TARGETS:Mshow-all*}":?${_VARGROUPS:O:u}:} -. for w in ${_VARGROUPS_WIDTH.${g}:U23} +. for w in ${_VARGROUP_WIDTH.${g}:U23} show-all: show-all-${g} diff --git a/regress/infra-unittests/show-all.sh b/regress/infra-unittests/show-all.sh index 94381e39c83..dcbddcb83fc 100644 --- a/regress/infra-unittests/show-all.sh +++ b/regress/infra-unittests/show-all.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: show-all.sh,v 1.2 2020/07/01 09:10:11 rillig Exp $ +# $NetBSD: show-all.sh,v 1.3 2020/07/01 09:13:12 rillig Exp $ # # Tests for the show-all target from mk/misc/show.mk. # @@ -168,7 +168,7 @@ VAR_ENV= value1 value2 VAR_ARGS= value1 value2 _VARGROUPS+= var -_VARGROUPS_WIDTH.var= 15 +_VARGROUP_WIDTH.var= 15 _PKG_VARS.var= VAR_PLAIN VAR_PLAIN_LONG_NAME _PKG_VARS.var+= VAR_ENV VAR_ENV_LONG_NAME _PKG_VARS.var+= VAR_ARGS VAR_ARGS_LONG_NAME @@ -185,14 +185,16 @@ EOF create_file 'expected' <<'EOF' var: - pkg VAR_PLAIN= "$$var $${var} $$other $$$$" + pkg VAR_PLAIN= value pkg VAR_PLAIN_LONG_NAME # undefined pkg VAR_ENV= \ - "$$var $${var} $$other $$$$" \ + value1 \ + value2 \ # end of VAR_ENV (sorted) pkg VAR_ENV_LONG_NAME # undefined pkg VAR_ARGS= \ - "$$var $${var} $$other $$$$" \ + value1 \ + value2 \ # end of VAR_ARGS pkg VAR_ARGS_LONG_NAME # undefined |