From nobody Mon Jul 13 07:39:11 2026 X-Original-To: dev-commits-src-branches@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 4gzDpS25g0z6kX3W for ; Mon, 13 Jul 2026 07:39:12 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gzDpS05T9z3tPF for ; Mon, 13 Jul 2026 07:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783928352; 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=YkRcyYVO3rU2xJjPISSsUw9fbG5m/uzBY+puUmJBFns=; b=yyxmCHqs4Ek6+QKrCJFzCoUScgL4gL9nR8zlsFvNfUGLQi6olkynDjrU1zJbOpfm2YK6mM 5A30uAWcocuzWpxoIw+HknIiSR4EUeq42YUQNjfHMHEQ46/OVZZZ8naiqOV0GZtTa6kT8Q eblNybEy5jWH/Acmw3d+JL69OUN1oGLhVz36tBsV5dNfa6sk3bObPFECGRqPLwOUx1EbnB PQVJ4dD/AoH22zW1zp369ysuqVdhQZBTDPKDq+Wp74HhgayFWKNRM42FMXv3Fmeh2sSnKr mmHGCBrwIPv41ZsFbhw/a0SqksGFIVSz2ct8qf5HB9Ikwnpt9CPn3yt4/VetxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783928352; a=rsa-sha256; cv=none; b=ebO1IPQkUGmEfNiHHTmRoEVnixrgde1YqGTfOY1oMfMMX7ymvExeJX7bGulavSVhRRuv9m gg/tM16iyGDRNGrT/TJpXhkS81cnd+tvoCV2aHrbW9cP6Lc6hOwJ+hq3aUrcbeLpV2RCpK Zp8kVuzDIyF3BJsdMr9YrdubEg+gJP75ULFQC9AnJvzQTkUuAmL61zGozf+vjh5357+1dB vXSjamDBhHVYndy3EJz3rHQjqtGtNsHZwnNXUEzOlmJLVaVOHY8btW0eCT/ejcraRS+LxD 7ABMQI5qlPTvSg8INQs+/jX5x92KRVZ49CUOJ3p1YgaJGtg04eRlghQo6K0s8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783928352; 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=YkRcyYVO3rU2xJjPISSsUw9fbG5m/uzBY+puUmJBFns=; b=ep68l0qGCWRdprloO+dcnU8BxguTfnTEOzdGzXaORLn3d1yNGMa9e/enmJYKICJQeodp+z wjCazPsFqeC1ZyOSVZyqGnDkiXteEKjoRZ+wg+IGdf/7RF5ayd7IP1WJlr1p5qx6eHqgpi ZZy3Yfujyx0z6TbZMFJxU1N5BDIRJqOP229ZnPqgA9OKzv7r8oCZSaixszfgB5WDMHNMrI 9i5UGJj7B+qhwYcagsc4hn4Hr0z1fscU6gjFF0ttJWMlDyzHT+XSJU50/oxV1f4eiSWB6r 7jE+wzIuPodHxNbwVn8vlMU6wiE3LLVEVZ+90y8NH9f7xtMlc1arXbLHrgSFtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzDpR5nxDzpgk for ; Mon, 13 Jul 2026 07:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23cdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 07:39:11 +0000 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=B8rg?=rav Subject: git: b775479ca2c4 - stable/15 - src.conf(5): Suggest using ccache4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: b775479ca2c4fa286562e184a2cb9329448f33e5 Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 07:39:11 +0000 Message-Id: <6a54961f.23cdf.2062005c@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b775479ca2c4fa286562e184a2cb9329448f33e5 commit b775479ca2c4fa286562e184a2cb9329448f33e5 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-02 15:16:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-13 07:30:06 +0000 src.conf(5): Suggest using ccache4 We have separate ports for Ccache 3 and 4. Suggest both, rather than only the Ccache 3 port. Rearrange the text somewhat to avoid an excessively ragged edge on a standard 80-column terminal. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D58005 (cherry picked from commit a2545f68f64b4cfcc13ca2d372c8b9fef1c6331e) --- share/man/man5/src.conf.5 | 19 ++++++++----------- tools/build/options/WITH_CCACHE_BUILD | 17 +++++++---------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2ec7862b1a21..cc1b58d28f5d 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd June 26, 2026 +.Dd July 13, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -348,22 +348,19 @@ Use .Xr ccache 1 for the build. No configuration is required except to install the -.Sy devel/ccache +.Sy devel/ccache , +.Sy devel/ccache4 , or .Sy devel/sccache -package. +port or package; in the latter case, set +.Sy CCACHE_NAME=sccache . When using with .Xr distcc 1 , set -.Sy CCACHE_PREFIX=/usr/local/bin/distcc . -When using with sccache -set -.Sy CCACHE_NAME=sccache -in -.Xr src.conf 5 . -The default cache directory of +.Sy CCACHE_PREFIX=${LOCALBASE}/bin/distcc . +The default cache directory is .Pa $HOME/.ccache -will be used, which can be overridden by setting +and can be changed by setting .Sy CCACHE_DIR . The .Sy CCACHE_COMPILERCHECK diff --git a/tools/build/options/WITH_CCACHE_BUILD b/tools/build/options/WITH_CCACHE_BUILD index 9a5c2ce1cb80..f2a8505ee372 100644 --- a/tools/build/options/WITH_CCACHE_BUILD +++ b/tools/build/options/WITH_CCACHE_BUILD @@ -2,22 +2,19 @@ Use .Xr ccache 1 for the build. No configuration is required except to install the -.Sy devel/ccache +.Sy devel/ccache , +.Sy devel/ccache4 , or .Sy devel/sccache -package. +port or package; in the latter case, set +.Sy CCACHE_NAME=sccache . When using with .Xr distcc 1 , set -.Sy CCACHE_PREFIX=/usr/local/bin/distcc . -When using with sccache -set -.Sy CCACHE_NAME=sccache -in -.Xr src.conf 5 . -The default cache directory of +.Sy CCACHE_PREFIX=${LOCALBASE}/bin/distcc . +The default cache directory is .Pa $HOME/.ccache -will be used, which can be overridden by setting +and can be changed by setting .Sy CCACHE_DIR . The .Sy CCACHE_COMPILERCHECK