From nobody Sat Aug 23 00:11:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c7yCJ73t7z65Rdf; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCJ2pLxz3ZmX; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ9Tdy6al0yMLMSGzuIYijJclAmQXmnOt7nr18UqlLo=; b=TvwRyTH4wPCO05h8pk3lJ2Ayd6TvSvRhDZYsKZA/pMGjRYdE8J8Es0Jp/DhMUfPinZhtZS 7DlnZ6Rk3yn07TKICpdeA7S0RrYMd/YRVL+DWCzFA4975D/r4VKbT/pLeTwhFFkIayQP6b huVnPOwg87OKygCTZ+W5PasgsTXIYtZy5kc6McbtQyJeQ8tvQRp8D9ylFAlqWrGd9anGmj r3g8okw037OJaX2MHQ3DzULQDii2lKeVPsyUmk+zgaH36XuOPdOFDihPMBqiGjNzfXUmW0 uoRC4jzsGsSIYPuyVE7XdSzJNl7EAJtOwc7k0Q8q0b5mAHGzxPu4sy4200hMwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZ9Tdy6al0yMLMSGzuIYijJclAmQXmnOt7nr18UqlLo=; b=f6YDPnuayyXh6ZlGanFZcFH4iXblwuzzzj/E43ucSGlAW1NDGOQq22YxiurGMHK3dIl2+n 2p4Hc2tPCs4kBBg8qq9FvA2+4TiXyNNDHg50uIH9k0KDyuzUxkOo0dGRNV+IphT/tVHhAY IKA6/2Ox+YrpY65jpbYL0XaUnfaBkvaZmE8kC7b9noEpdS5Qlwi5fXDqsWaYIAdzsPWrgC pumuuVw/EJyEwDzlmmeH4nH3gVY1y1gFg9SDTkrEHhlDMZfeNNzy4UDXpe98U2x7K+C9Cd MBT+3rD+27avGvV1+MZIWmkXJ+p8bwep+XcYNV105OkeyTP1Eb6x+YfxUWIXkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907884; a=rsa-sha256; cv=none; b=S8/JBu76uj3hvJrx5hooL9QCOVruhiC0QU0P21AbBrwBo39T7XIyAnpM83m6XcyNYy2i5t WfmQf/Qb6r3rkZhhJ8K9HOkvoo8JX3bELN5v9u7iGBl+ULt37kTbfXQ/ynZxFQ1TvwtC7D uuZERI00gvB2CaG/SXf7cM5FY2ea9Lgx7X560mH3y0Au9VEQn7wiNtXzWnTVoRDsfyoi+I xXen72b+ChmvTCKx2qkIHy7jo9nQU8gQh+D3Z/1fblyltfNg3qo5e7mGtGjB4yxbbGeg2c PZdCmqlxzgPfG6zgADhkE7f3lYjPfRzPJRvGY/VMT1VeERejdJhYvVA0jiUhmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c7yCJ2Bbyz17PS; Sat, 23 Aug 2025 00:11:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57N0BOeG099791; Sat, 23 Aug 2025 00:11:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BOnt099788; Sat, 23 Aug 2025 00:11:24 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:24 GMT Message-Id: <202508230011.57N0BOnt099788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 394f7ebf10bd - stable/14 - share/mk: Use :ts,:[*] to stringify TAG_ARGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 394f7ebf10bdb398d31f9115dd26b2d900fe1f6d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=394f7ebf10bdb398d31f9115dd26b2d900fe1f6d commit 394f7ebf10bdb398d31f9115dd26b2d900fe1f6d Author: Lexi Winter AuthorDate: 2025-08-07 11:44:01 +0000 Commit: Lexi Winter CommitDate: 2025-08-22 22:12:43 +0000 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 (cherry picked from commit 399faa7d3ae8938d73d58c9224123a71a2096947) --- share/mk/bsd.confs.mk | 2 +- share/mk/bsd.dirs.mk | 2 +- share/mk/bsd.doc.mk | 2 +- share/mk/bsd.incs.mk | 2 +- share/mk/bsd.lib.mk | 2 +- share/mk/bsd.links.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index c4fb62782b75..6b67273aa1ea 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -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 diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk index 8e090d3f2cbd..6a7f2ed83f64 100644 --- a/share/mk/bsd.dirs.mk +++ b/share/mk/bsd.dirs.mk @@ -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} diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 59025a1cee05..9633b89f95c2 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -84,7 +84,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} diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index df4cf4641141..848ee0aa2ea9 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -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= diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index c9f92cc57000..d6a7786e17fd 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -74,7 +74,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 diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 437ffd0d3b34..509520a24a3a 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -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 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3895ff67a787..0d3bac406e23 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -121,7 +121,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"