From owner-dev-commits-ports-all@freebsd.org Wed Jul 14 18:09:41 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DFA3653A3C; Wed, 14 Jul 2021 18:09:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQ5BF2gv5z3JyY; Wed, 14 Jul 2021 18:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 424FD1AAF4; Wed, 14 Jul 2021 18:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16EI9fNb061460; Wed, 14 Jul 2021 18:09:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16EI9f5D061459; Wed, 14 Jul 2021 18:09:41 GMT (envelope-from git) Date: Wed, 14 Jul 2021 18:09:41 GMT Message-Id: <202107141809.16EI9f5D061459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 481cf80cb422 - main - Mk/bsd.ccache.mk: Fix Poudriere CCACHE_STATIC_PREFIX feature. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 481cf80cb4226bcb94fe743428879848550f659e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 18:09:41 -0000 The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=481cf80cb4226bcb94fe743428879848550f659e commit 481cf80cb4226bcb94fe743428879848550f659e Author: Bryan Drewery AuthorDate: 2021-07-14 17:58:11 +0000 Commit: Bryan Drewery CommitDate: 2021-07-14 18:09:37 +0000 Mk/bsd.ccache.mk: Fix Poudriere CCACHE_STATIC_PREFIX feature. Poudriere's CCACHE_STATIC_PREFIX feature (not Mk/) avoids installing ccache for each port using the native jail ABI and instead copies in a host static binary. It uses NO_CCACHE_DEPEND to avoid installing ccache. For example, this is used for ccache-memcached where the dependency chain would make using ccache unfeasible. Poudriere sets CCACHE_WRAPPER_PATH, rather than the new CCACHE_PKG_PREFIX. Because CCACHE_BIN is now computed from CCACHE_PKG_PREFIX rather than CCACHE_WRAPPER_PATH, CCACHE_BIN was incorrect. Now compute CCACHE_PKG_PREFIX from CCACHE_WRAPPER_PATH if it is set, otherwise fallback to using LOCALBASE and computing CCACHE_BIN and CCACHE_WRAPPER_PATH from there. PR 257151 Fixes: 6b641f4eb4 ("Mk: Document and simply user-modifiable ...") --- Mk/bsd.ccache.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk index 0a240bcffe03..fa1b32ca8cfd 100644 --- a/Mk/bsd.ccache.mk +++ b/Mk/bsd.ccache.mk @@ -57,6 +57,11 @@ WARNING+= WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR. .if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \ !defined(NO_BUILD) +# Poudriere will only define CCACHE_WRAPPER_PATH for using a host-static ccache +# binary. +.if defined(CCACHE_WRAPPER_PATH) +CCACHE_PKG_PREFIX= ${CCACHE_WRAPPER_PATH:C,/libexec/ccache$,,} +.endif CCACHE_PKG_PREFIX?= ${LOCALBASE} CCACHE_WRAPPER_PATH?= ${CCACHE_PKG_PREFIX}/libexec/ccache CCACHE_BIN?= ${CCACHE_PKG_PREFIX}/bin/ccache