From nobody Tue Sep 16 13:59:25 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 4cR3Rf46G6z67Jkb; Tue, 16 Sep 2025 13:59:26 +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 4cR3Rf2qFCz3Xc3; Tue, 16 Sep 2025 13:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031166; 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=AmzGOLimnDMp0ZPkSvMODp2/owFiyIv2GkuMB4CKFho=; b=fqgqTobmrYNJYAIhVdUVVwJlI4IuFIbT9KQ9kusEbtqGcyvlGxqSWQgZN0NAlyfSth3np+ J4/EqH+Iz8zR9JaQyTpPsQbi34W4aHiOfSOLsPHRT39nH0kks27pCWnBgqtxmjisQlSSiN x890sF7VDiF8shcW4+Ayw0OuiIBodpq3E48g2zH6/eUYmzVkCQVjwsKCvWebhLcGXP7XBw 3/oZuP27ed5nddKnRYT6iiz7TMkiXu4U/Tu6nflwbzU56swBD8traBtff8gA4dh7Jp+Ad9 zPGjarMQeJp/svGId2741cd23bPcpO4iwqbgUnVpefW8Ig0vsvqnxa2IbZQ6Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031166; 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=AmzGOLimnDMp0ZPkSvMODp2/owFiyIv2GkuMB4CKFho=; b=pu9p7qvIDLHLc/FWUXdBRFkGNvMogRaAiwtRRcGuMUG7vAxN4T+8HXsePLHGHjVkaerCxO 8r39O0mM6Ds5hmL55es4QHlHJUxvMVwDa7nQLBEPq7w1YZtg6GcolZ3bgVOvnJvHCDnK5I o1VzD2BkI7oRrsIXvX0HPel4W79uSe9wxkeFvUMFUmhwvlWVXQweqTZcqV4xPNI/LumTDH xC+YJQgyh7+4B93FFoX3hd3Zc6WVMoWeny5Pthl4y/Fj0nzrGSbxjcVzntbAqHO+nAzXdK do7p/S9OW0PP5PW0cioW99JV4JX+y0BCyLLhnryPETmZzhAHFcJVj5YASZ7cKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031166; a=rsa-sha256; cv=none; b=oQ+RT/vwpt1WHSJJSUpsmftIdtm1Lzx11K2eXPn4+fFOTKt43JWXTBhpKsMaOQ/dfVxayN BJvKUPQiq72zsfZWf/7rSGi29+TEMGrO3r9wgdJTvqSSzuN5rqROT8kWLZ2EJOzqE7PHHz pZ782fZ3gcxJMb93wTXMmotY6TStFj6caot633A27cNDnsY2+l0NG1paLUO//PIvMmGcF8 NJ3hs74SwwJIVLABqEX4YKJDcNh7Ny3UDoBUllgXoomPx8uhuTUp2eFYtuKCQJjIGbllbj GzqpAZWeuiXAOW+3rXBFIp/OB+6fUybx7xybri6VSAL5s9WfL1Xtkc3qeOTc2w== 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 4cR3Rf0B8Gzkfq; Tue, 16 Sep 2025 13:59:26 +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 58GDxPTn065010; Tue, 16 Sep 2025 13:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxP5d065008; Tue, 16 Sep 2025 13:59:25 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:25 GMT Message-Id: <202509161359.58GDxP5d065008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: eafc54027d2e - stable/13 - src.sys.mk: Support src.conf in SRCTOP 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eafc54027d2ee6feac2114277d3c0f5131c9325f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eafc54027d2ee6feac2114277d3c0f5131c9325f commit eafc54027d2ee6feac2114277d3c0f5131c9325f Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:55:22 +0000 src.sys.mk: Support src.conf in SRCTOP If SRCCONF is not defined and src.conf exists at the top level of the source tree, use that instead of /etc/src.conf. MFC after: 3 days Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D52470 (cherry picked from commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4) UPDATING: mention the src.conf change Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") (cherry picked from commit ab2fea3f9a5a58f0ba90499ad3a8614e3dca0c5f) --- .gitignore | 1 + UPDATING | 5 +++++ share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.sys.mk | 4 ++++ sys/conf/kern.pre.mk | 4 ++++ tools/build/options/makeman | 7 +++++-- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 668b6d90483a..454340511754 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ cscope.in.out cscope.out cscope.po.out tags +/src.conf diff --git a/UPDATING b/UPDATING index a40ddb1d3670..84474463a407 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ and/or ports. has changed. An NFS server that exports any of these file systems will need its clients to unmount and remount the exports. +20250916: + If SRCCONF is unset and a file named src.conf is present at + the top of the source tree, it will now be used instead of + /etc/src.conf. + 20240419: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have been upgraded to 18.1.6. It is important that you run `make delete-old` diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 181b4fea466d..01721e786aa1 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd March 8, 2024 +.Dd September 16, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -30,8 +30,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index d5c2af0c559d..d563859586b0 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -6,7 +6,11 @@ .if !defined(_WITHOUT_SRCCONF) # Allow user to configure things that only effect src tree builds. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if !empty(SRCCONF) && \ (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \ !target(_srcconf_included_) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 8728ac269dd6..c0af7ea7313f 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -8,7 +8,11 @@ # the rest of /usr/src, but they still always process SRCCONF even though # the normal mechanisms to prevent that (compiling out of tree) won't # work. To ensure they do work, we have to duplicate thee few lines here. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .include "${SRCCONF}" _srcconf_included_: diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 05a07f592b09..875d8cf16b9d 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -174,8 +174,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable