From nobody Fri Oct 10 04:43:32 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 4cjYz86P9Hz6BG9v; Fri, 10 Oct 2025 04:43:32 +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 4cjYz84kHXz4PbX; Fri, 10 Oct 2025 04:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071412; 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=rZTjsxF09SZ4amPeOgI7hUWoiNQrwlGda4ETg1cd2/k=; b=h9tr8OBeDxRot2tCRp9mJcUzDIMnYG4FFCcn4bzWlIPnoKts2zP1UaFzDcoXoVMrTbbvHo Be1gyQumrQr0vBYnZMZaT0pLCuwOZI+tGA8uN2Pg/S57L18N1VxnjO45+cXd9bRdR4Vf3G tQzkKLQgCpMal22IB44vzosuhmBnMPSNhprwV1xpcFAQoB+LAex3l3wgH9hDQpUGVEhptO ZiCa5M7mOH2ubrj7eT9OlFNB7LM5lXvMQCqZ0a+V44nyqegRx1O/EA8+GDLpEil08J7Obt FoGQDmf4KXhPD9cQRZAmFyjrV7bSR5HyGfEgnRycyHrrkeC2pYFoZT3yLcmvig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071412; 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=rZTjsxF09SZ4amPeOgI7hUWoiNQrwlGda4ETg1cd2/k=; b=u1iPPrD4CxFYh7h7dfZk00eRBroNX8cJ3Tiw/OFOjmjU+0NaVgorusoLaKPPf/SxUYW09b a77GfcygT2PtOfxE7Wa/cdUBOE96G4SvO/Hh368gP6frnIAhbUwQtHpkprgE+fC/Qornhr bC4tQ9sRqREVfYSB/q90xh9PlQohg8wXOfNo8BuIvlDyRuh/bjB5W/Dyg3jAcTlbEajlhd au9WvQhnSdvNAEzKiAXo6pxUtaj/19Oe3jXZfoqSRU/5fNE0jidZuTDFKNKG6uq7LS/yUR 68x0h+3FuxVAHQAt56hk4ylr3gZU83pgYNSre6Z8bFErL6KtB4Ha2hxZEYZzMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760071412; a=rsa-sha256; cv=none; b=g8Zv30paUCiWLZ2JuEOBcac4GheYpKek72Vgs61o7VxfY7qd7sfyeO7085nQj+w1l4AsbN OOiMcrL81w/ad0aC7vyG/ps+8I63Zv5SxN7dB7Zkc8p20kytQ4xnrT3u3u5miIRRE66/Ah +VSpHdBnz1UH8N3bYJr/Hw6M8J5j0B3N8LMTgYpPvTu6y6XZfU3TzpMJhz9hDMsExH74bk MpRQ/W+vsNU2pNQ8w2NF0iPx1yr+v2x6wIbelX4gE6e2amAOMEq06xU43n+FPHSF2jKRIi NpbLDdaMQuJjb2nFoWGMGvu1x7h7SdDrsYluWbyvijg76DxP2Kiw6RSCrb1ktQ== 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 4cjYz84CJkzp8b; Fri, 10 Oct 2025 04:43:32 +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 59A4hW0A096905; Fri, 10 Oct 2025 04:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A4hW7d096902; Fri, 10 Oct 2025 04:43:32 GMT (envelope-from git) Date: Fri, 10 Oct 2025 04:43:32 GMT Message-Id: <202510100443.59A4hW7d096902@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: cad4ddf2010b - stable/15 - bsd.confs.mk: Support CONFGROUPS.yes 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/15 X-Git-Reftype: branch X-Git-Commit: cad4ddf2010b6315d68a56c19a2209e355e5dfc0 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=cad4ddf2010b6315d68a56c19a2209e355e5dfc0 commit cad4ddf2010b6315d68a56c19a2209e355e5dfc0 Author: Lexi Winter AuthorDate: 2025-10-08 06:07:10 +0000 Commit: Lexi Winter CommitDate: 2025-10-10 04:30:23 +0000 bsd.confs.mk: Support CONFGROUPS.yes Align CONFGROUPS with other options like SUBDIRS and FILESGROUPS by supporting the CONFGROUPS.yes option. This means logic like this: .if ${MK_FOO} != "no" CONFGROUPS+= FOO .endif can be replaced by: CONFGROUPS.${MK_FOO}+= FOO MFC after: 1 week Reviewed by: imp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52923 (cherry picked from commit 0f5ed3c427fff845797c2af2aeceb5855f32a4f4) --- share/mk/bsd.confs.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk index 77b573c7e42c..e953e6d978dc 100644 --- a/share/mk/bsd.confs.mk +++ b/share/mk/bsd.confs.mk @@ -22,6 +22,14 @@ buildconfig: ${${group}} all: buildconfig . endif +# Take groups from both CONFGROUPS and CONFGROUPS.yes, to allow syntax like +# CONFGROUPS.${MK_FOO}=FOO. Sort and uniq the list of groups in case of +# duplicates. +.if defined(CONFGROUPS) || defined(CONFGROUPS.yes) +CONFGROUPS:=${CONFGROUPS} ${CONFGROUPS.yes} +CONFGROUPS:=${CONFGROUPS:O:u} +.endif + . for group in ${CONFGROUPS} . if defined(${group}) && !empty(${group})