From nobody Wed Oct 8 06:13:08 2025 X-Original-To: dev-commits-src-main@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 4chN3S29Dwz6BNLd; Wed, 08 Oct 2025 06:13:08 +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 4chN3S1fD4z3DRS; Wed, 08 Oct 2025 06:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759903988; 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=C69B5PMFvayU/t+UlQHWMJGnKlt0vHTkLmv0CRdnDhY=; b=oovLFnThBv02hAbnJ8OFqs3/oq1A+KTc6aRKpGYrGZbZEICSP/LN32fqf5RJ41QmVU+YtA suWZBRldJjHb9LR8CWi19tYRJENEqLOHLdL4s+ZaCniLKGyjaOc/2T37NYSoBw0BFwnGMQ /TE2cViT8V5a6SGlK6R2dArKnnxG45Qg+kAWDIuSYp3oLCcf7C0ma/pBHvos0mLBMMMyHy DUTBTCKsX8tfqKlkP2JuD+iFuq0Mm2nKFFoHMn4xHzDfckko5U88n/37SL9Uh+XxqpOQoY uQFAkIEHfHF28P4vsSgLtAGTiXoAUj/vva5NKLmqRNIwJZDORlM+hbZXA4oG9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759903988; 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=C69B5PMFvayU/t+UlQHWMJGnKlt0vHTkLmv0CRdnDhY=; b=Byj+0vKTVNnPK6FXUnPvLH00yoj5bPKgAAtwDBs10pVaiijWKinhw8kiG5xeurXNxja3HZ l2A7fhZmkjfsTz8g9ct++NWyDQJxWtIgLPUo7wWxgbmE4vbffdophm4IsqAIGKvbbzbJc9 K0uSk5C2ds7Wd5izsYttl9WA4o0ajwkHAY2nobXeb6bnnMlpV92g8rNNJnTu2uy0yb10gy StQN+Sl4W/ZxB7OlajHS0qfmFvCEyzWhQUL0g/yEz4/6V/GQqYZe2OuMtR1pZy4DyxtiTq 1H+mhfGbphWZojGmevKshn2srUG1HZn422MCP03UWzsDiBq7dfULMyPNPaR86A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759903988; a=rsa-sha256; cv=none; b=NsdtFXPaFKKvWWUrnImToCu6ZzylhyC8Xl4ZLWp+KpVcudDJVZMZeyuMIzkKaOZQKhKETl a9QUxkST6N58ZKb4gQzU2vjMmc+IoYe7Y8MHFVhASSOttyMuALocRUUs4A+CO7SXN8pQuh jPtj302XRNsvphAyvEanUOyWsVHUQJcV9uLSTZk31a2YqfqzFghnCjnc/RWxeDys6pacPT lPc3lsZRST19+9c0vLKR93IR5eJNnPKOFXpU15SXl5Uo9axzPHB0uTlUcEndTvTIKsvzji tnzQ7p0YbtNVFq+RNXBuNRJKmooqAUovQSxabY5IvE8BHLM0zXcIBvE/DDHN8w== 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 4chN3S1DMGz3N6; Wed, 08 Oct 2025 06:13:08 +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 5986D8W0042524; Wed, 8 Oct 2025 06:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5986D8RG042521; Wed, 8 Oct 2025 06:13:08 GMT (envelope-from git) Date: Wed, 8 Oct 2025 06:13:08 GMT Message-Id: <202510080613.5986D8RG042521@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: 0f5ed3c427ff - main - bsd.confs.mk: Support CONFGROUPS.yes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0f5ed3c427fff845797c2af2aeceb5855f32a4f4 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0f5ed3c427fff845797c2af2aeceb5855f32a4f4 commit 0f5ed3c427fff845797c2af2aeceb5855f32a4f4 Author: Lexi Winter AuthorDate: 2025-10-08 06:07:10 +0000 Commit: Lexi Winter CommitDate: 2025-10-08 06:07:10 +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 --- 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})