From nobody Thu Jul 2 15:17:14 2026 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 4grgV31swkz6dXnc for ; Thu, 02 Jul 2026 15:17:15 +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 4grgV25kZTz44JQ for ; Thu, 02 Jul 2026 15:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783005434; 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=8uqYZuRoBqzkOHOSfdzKD9mXxpIHWsYyErknq91DPgM=; b=caOn/yQB/5BTWy5th002bN6dmo4+VD+KZNQ0Iu48hJ8MD67GOeApuHTj3FfsEAoGQx685v 0KecY13oISt5kBRNQSoyUNVLc5l9+B74gHllUTYDybDe6v6HBvTFpt5b2GXChsdzDCxWdD 2yJd7xJMDGq3rn446z6juWVYed/mPi0feUWC0Uo83kRQhB1Zta1wWnIzTgaglEIg4EFrAj THYt82UUZyAEl7yeOdM5MDg2oQbrg7qN2tXCOQM8zDO5PgPJ2BV6arM+5Q1iW0ftO+GMvE 93stWkP0VbcpSDJohDNdjeBPIkaMulVW6WdFNuu2mqKWPIhn83sfRKr/HCwdqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783005434; a=rsa-sha256; cv=none; b=Srk6TJ1ILaXdUvk34IHHtXzbKNgzc7mBFdG3IYc47cN17etWmUPy++RFjtLKXyC2fqZURk os64A+WpesCqe/M08f1vxGc0jrOdxhvBCOWBjGOY5tsY+X8nNxTqapvvAE2miVaV8XeU1C POz6WA9nEyJd7+WdEQt671u43JUeDZwlnWI8WL6gsUN+SGad4hiqDsm9s4hTNg0viy7m4W G3aiJwwUyRl8qstB2xLlM2BLnhPFO+sf8YdyNUwVJHpRqxm352OyPoHVUu4CWCJZFFOWo3 6eMFqBH+QMvdT5O4PTJ4S/TInttYs45qVXhDjn1kSM+iiQIQiHSSKneus8xDWA== 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=1783005434; 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=8uqYZuRoBqzkOHOSfdzKD9mXxpIHWsYyErknq91DPgM=; b=YyYql69QPShcMAymlDyeI1YTaYa9RdMgZSOBnLdhW+XJCjzzNSeFBVApgbDigAmazRm1An vZa6pcMvg1FZSMTdk/7zFeFZhFlC4bFvSTsnvMQNeNHVDtC8XHg1/+hXzz5NsK0G2+UnCB V2ONHgJ6QvOw3A9/L42IqTnXQfdqpwAMQ8sxgD4qdmgKpZDkgw4vTdp8d5DXZhh9fkDiJC NVIciTCZzrP0EpSb9Ajhe5pTcbp4D+SUXVYh3WmxCvrsglszFgSso8VmQP+PYPkgXWecK3 aCtWJO10PtkGPJY+Q0p6sICmh9EJdEMM02ENexxFSDG2EP/deyijgkW5PjQq8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grgV244dsz15Xx for ; Thu, 02 Jul 2026 15:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4007f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 15:17:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: a2545f68f64b - main - src.conf(5): Suggest using ccache4 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 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/main X-Git-Reftype: branch X-Git-Commit: a2545f68f64b4cfcc13ca2d372c8b9fef1c6331e Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 15:17:14 +0000 Message-Id: <6a4680fa.4007f.13f2ae09@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a2545f68f64b4cfcc13ca2d372c8b9fef1c6331e commit a2545f68f64b4cfcc13ca2d372c8b9fef1c6331e Author: Dag-Erling Smørgrav AuthorDate: 2026-07-02 15:16:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-02 15:16:52 +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 --- 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 5921a5d7108c..40a901440f26 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 May 28, 2026 +.Dd July 2, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -328,22 +328,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