KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

share/mk: Use :ts,:[*] to stringify TAG_ARGS

Browse Source 
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:
Lexi Winter
2025-08-07 12:44:01 +01:00
parent 1e629ebb15
commit 399faa7d3a
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/mk/bsd.confs.mk
+1 -1
View File
@@ -49,7 +49,7 @@ ${group}TAGS+= package=${PACKAGE:Uutilities}
. endif . endif
. endif . endif
${group}TAGS+= config ${group}TAGS+= config
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} ${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]}
. endif . endif
share/mk/bsd.dirs.mk
+1 -1
View File
@@ -22,7 +22,7 @@ ${dir}_FLAG= -f ${${dir}_FLAGS}
. if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*} . if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*}
${dir}TAGS+= package=${${dir}PACKAGE:Uutilities} ${dir}TAGS+= package=${${dir}PACKAGE:Uutilities}
. endif . endif
${dir}TAG_ARGS= -T ${${dir}TAGS:[*]:S/ /,/g} ${dir}TAG_ARGS= -T ${${dir}TAGS:ts,:[*]}
. endif . endif
installdirs: installdirs-${dir} installdirs: installdirs-${dir}
share/mk/bsd.doc.mk
+1 -1
View File
@@ -82,7 +82,7 @@ TRFLAGS+= -t
.if !defined(TAGS) || ! ${TAGS:Mpackage=*} .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uutilities} TAGS+= package=${PACKAGE:Uutilities}
.endif .endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif .endif
DCOMPRESS_EXT?= ${COMPRESS_EXT} DCOMPRESS_EXT?= ${COMPRESS_EXT}
share/mk/bsd.incs.mk
+1 -1
View File
@@ -37,7 +37,7 @@ ${group}TAGS+= package=${${group}PACKAGE:Uutilities},dev
${group}TAGS+= package=${PACKAGE:Uutilities},dev ${group}TAGS+= package=${PACKAGE:Uutilities},dev
.endif .endif
.endif .endif
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g} ${group}TAG_ARGS= -T ${${group}TAGS:ts,:[*]}
.endif .endif
_${group}INCS= _${group}INCS=
share/mk/bsd.lib.mk
+1 -1
View File
@@ -72,7 +72,7 @@ TAGS+= lib${_libcompat}
.if !defined(TAGS) || ! ${TAGS:Mpackage=*} .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uutilities} TAGS+= package=${PACKAGE:Uutilities}
.endif .endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif .endif
# ELF hardening knobs # ELF hardening knobs
share/mk/bsd.links.mk
+1 -1
View File
@@ -7,7 +7,7 @@
.if !defined(TAGS) || ! ${TAGS:Mpackage=*} .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE} TAGS+= package=${PACKAGE}
.endif .endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif .endif
afterinstall: _installlinks afterinstall: _installlinks
share/mk/bsd.man.mk
+1 -1
View File
@@ -114,7 +114,7 @@ ${__group}TAGS+= package=${${__group}PACKAGE:U${PACKAGE:Uutilities}}-man
.endif .endif
.endif .endif
${__group}TAG_ARGS= -T ${${__group}TAGS:[*]:S/ /,/g} ${__group}TAG_ARGS= -T ${${__group}TAGS:ts,:[*]}
.endif # defined(NO_ROOT) .endif # defined(NO_ROOT)
${__group}INSTALL?= ${INSTALL} ${${__group}TAG_ARGS} \ ${__group}INSTALL?= ${INSTALL} ${${__group}TAG_ARGS} \
share/mk/bsd.prog.mk
+1 -1
View File
@@ -129,7 +129,7 @@ STRIP?= -s
.if !defined(TAGS) || ! ${TAGS:Mpackage=*} .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
TAGS+= package=${PACKAGE:Uutilities} TAGS+= package=${PACKAGE:Uutilities}
.endif .endif
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} TAG_ARGS= -T ${TAGS:ts,:[*]}
.endif .endif
.if defined(NO_SHARED) && ${NO_SHARED:tl} != "no" .if defined(NO_SHARED) && ${NO_SHARED:tl} != "no"