From nobody Thu Aug 7 12:37:22 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 4byRWQ5GQnz64Dc6; Thu, 07 Aug 2025 12:37:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byRWQ4S4Gz3sf3; Thu, 07 Aug 2025 12:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754570242; 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=fYuv7paHzKOmZY31A+Mu/aFlGPfNPu7HwHAjYfSHeLA=; b=Ibc4gC44tvYH02+cYbkbc4bfQYsFST36jk3Vf45omAFdk3qJM+PXbW5j4FknE//XQ7J0k8 ENrLKTUw2LmsdrV0tfCi3KGAWOznEq6tcDmhbYTTIoyajHwRqqo0y/GAtH7q1zPLVWbxcd FY0ML71vyuqll6S1068Zv/3wB9aSRfpNK9cMyq4vpb6pHhofTH2e/Tq3ZSpojrufMwP6rV b5ad+hKMpiOnYz1XHxwHe6HObLNEkyWq8r86jnrk3bg7PXQqtLHiP3sp13jFDT4btqzCKZ iwC7VwpWJ+1C9q4tY9XwrYifZ58hj4OAS2GlTGR/sTVOMW+bQ1sB7saT4C6i9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754570242; 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=fYuv7paHzKOmZY31A+Mu/aFlGPfNPu7HwHAjYfSHeLA=; b=h21dIZV4cxmRsjl+VL2Df32JBVxp/6XSV3f+jsIntlkJiXZ5EZKFXZn6AQT7tjXA7eBSws nhYoZ52DKtUqAc1y4tmMt1Vdmd7Zsi5lZEILOIKemHOPCDlKvKguY3FxR3A+839vPIBs5w bMOkByAju9WXI+qhrXmFDQpXyC+aesvCP5FZ7Rd33ZblDk23/+IYm2bF73EQsjui3BVsbs zAdNADfy+KBEKfQNsbguvdIbJ2mOLe1IqttNV8/rtSSSBx4gWNCMHSD+khIU+T6SDI3O1M UEu3O8ZnXVu/B5c5pdOQ23YsYt5R4UaVSCmJSbe0b4JnYsshl1ftjLflj1FU3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754570242; a=rsa-sha256; cv=none; b=CAHQzLQwnbaCiY2RMGiMrOXIUTErKc35Aqw4nikzTSM5FnCcVeQh9AKlc12Td/Av4mEZ0I gL/ZWh44cHwxsy23+7h4WPw+JMkt0mj3XLaGu7qO19hj0zTHkP/bPx6NN6ANOZ/OGH4vTl I4kbvDPWzWKT2onUgmRudcMmjvN8Ile9pYf2CLPMHVaj7/eXXt39d/OaZR345kkkuI/rvh u+R+Ci5b8JmK2TX4Kb4xPnh1K3gccFIPcQoZ9YKnvNmGiEroxXv4+tJSPJlJKogXck/mpI /DjiQRTwd88KwNJEFOqs8XYbZY67GNjOuyP4GSLiBy+16vGRX4mJhAlDwiCymg== 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 4byRWQ3kZsz15t3; Thu, 07 Aug 2025 12:37:22 +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 577CbMDc023695; Thu, 7 Aug 2025 12:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 577CbMi3023692; Thu, 7 Aug 2025 12:37:22 GMT (envelope-from git) Date: Thu, 7 Aug 2025 12:37:22 GMT Message-Id: <202508071237.577CbMi3023692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 399faa7d3ae8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 399faa7d3ae8938d73d58c9224123a71a2096947 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=399faa7d3ae8938d73d58c9224123a71a2096947 commit 399faa7d3ae8938d73d58c9224123a71a2096947 Author: Lexi Winter AuthorDate: 2025-08-07 11:44:01 +0000 Commit: Lexi Winter CommitDate: 2025-08-07 12:36:59 +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 --- 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.man.mk | 2 +- share/mk/bsd.prog.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index ea702cece28d..77b573c7e42c 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 317ff61cd604..1f81bda80eab 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 ea8c68e87d50..675639db7611 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -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} 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 01dd979af155..3013f32c2b36 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -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 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.man.mk b/share/mk/bsd.man.mk index 3444e9612a20..b21522796845 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -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} \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index f44556ef9b75..9350d4786cec 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -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"