share/mk: Use :ts,:[*] to stringify TAG_ARGS
This avoids a situation where we sometimes prepend an empty tag, leading to arguments like "-T ,package=foo". Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D51785
This commit is contained in:
@@ -49,7 +49,7 @@ ${group}TAGS+= package=${PACKAGE:Uutilities}
|
||||
. endif
|
||||
. endif
|
||||
${group}TAGS+= config
|
||||
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
|
||||
${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]}
|
||||
. endif
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ ${dir}_FLAG= -f ${${dir}_FLAGS}
|
||||
. if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*}
|
||||
${dir}TAGS+= package=${${dir}PACKAGE:Uutilities}
|
||||
. endif
|
||||
${dir}TAG_ARGS= -T ${${dir}TAGS:[*]:S/ /,/g}
|
||||
${dir}TAG_ARGS= -T ${${dir}TAGS:ts,:[*]}
|
||||
. endif
|
||||
|
||||
installdirs: installdirs-${dir}
|
||||
|
||||
+1
-1
@@ -82,7 +82,7 @@ TRFLAGS+= -t
|
||||
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
||||
TAGS+= package=${PACKAGE:Uutilities}
|
||||
.endif
|
||||
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
|
||||
TAG_ARGS= -T ${TAGS:ts,:[*]}
|
||||
.endif
|
||||
|
||||
DCOMPRESS_EXT?= ${COMPRESS_EXT}
|
||||
|
||||
@@ -37,7 +37,7 @@ ${group}TAGS+= package=${${group}PACKAGE:Uutilities},dev
|
||||
${group}TAGS+= package=${PACKAGE:Uutilities},dev
|
||||
.endif
|
||||
.endif
|
||||
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
|
||||
${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]}
|
||||
.endif
|
||||
|
||||
_${group}INCS=
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ TAGS+= lib${_libcompat}
|
||||
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
||||
TAGS+= package=${PACKAGE:Uutilities}
|
||||
.endif
|
||||
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
|
||||
TAG_ARGS= -T ${TAGS:ts,:[*]}
|
||||
.endif
|
||||
|
||||
# ELF hardening knobs
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
||||
TAGS+= package=${PACKAGE}
|
||||
.endif
|
||||
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
|
||||
TAG_ARGS= -T ${TAGS:ts,:[*]}
|
||||
.endif
|
||||
|
||||
afterinstall: _installlinks
|
||||
|
||||
+1
-1
@@ -114,7 +114,7 @@ ${__group}TAGS+= package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}-man
|
||||
.endif
|
||||
.endif
|
||||
|
||||
${__group}TAG_ARGS= -T ${${__group}TAGS:[*]:S/ /,/g}
|
||||
${__group}TAG_ARGS= -T ${${__group}TAGS:ts,:[*]}
|
||||
.endif # defined(NO_ROOT)
|
||||
|
||||
${__group}INSTALL?= ${INSTALL} ${${__group}TAG_ARGS} \
|
||||
|
||||
@@ -129,7 +129,7 @@ STRIP?= -s
|
||||
.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
|
||||
TAGS+= package=${PACKAGE:Uutilities}
|
||||
.endif
|
||||
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
|
||||
TAG_ARGS= -T ${TAGS:ts,:[*]}
|
||||
.endif
|
||||
|
||||
.if defined(NO_SHARED) && ${NO_SHARED:tl} != "no"
|
||||
|
||||
Reference in New Issue
Block a user