git: be98df0b75ea - main - Mk/bsd.ccache.mk: Rename CCACHE_PREFIX -> CCACHE_PKG_PREFIX

Bryan Drewery bdrewery at FreeBSD.org
Mon Jul 12 19:50:27 UTC 2021


The branch main has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/ports/commit/?id=be98df0b75eaa77c0c7153f4b389adf6c34691ba

commit be98df0b75eaa77c0c7153f4b389adf6c34691ba
Author:     Bryan Drewery <bdrewery at FreeBSD.org>
AuthorDate: 2021-07-12 19:49:53 +0000
Commit:     Bryan Drewery <bdrewery at FreeBSD.org>
CommitDate: 2021-07-12 19:49:53 +0000

    Mk/bsd.ccache.mk: Rename CCACHE_PREFIX -> CCACHE_PKG_PREFIX
    
    CCACHE_PREFIX already means something special to ccache.
    
    PR:     242944
---
 Mk/bsd.ccache.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk
index 7bcb72b222af..cd8124c020d0 100644
--- a/Mk/bsd.ccache.mk
+++ b/Mk/bsd.ccache.mk
@@ -4,7 +4,7 @@
 # WITH_CCACHE_BUILD=yes enables depending on ccache and using it in the build.
 # NO_CCACHE_DEPEND will additionally not add the dependency on ccache.
 # NO_CCACHE will disable using ccache entirely.
-# CCACHE_PREFIX is where ccache is already installed.  Default: LOCALBASE
+# CCACHE_PKG_PREFIX is where ccache is already installed.  Default: LOCALBASE
 
 COMMANDS_Include_MAINTAINER=	portmgr at FreeBSD.org
 
@@ -31,9 +31,9 @@ WARNING+=	WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR.
 .if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \
   !defined(NO_BUILD)
 
-CCACHE_PREFIX?=			${LOCALBASE}
-CCACHE_WRAPPER_PATH?=	${CCACHE_PREFIX}/libexec/ccache
-CCACHE_BIN?=			${CCACHE_PREFIX}/bin/ccache
+CCACHE_PKG_PREFIX?=		${LOCALBASE}
+CCACHE_WRAPPER_PATH?=	${CCACHE_PKG_PREFIX}/libexec/ccache
+CCACHE_BIN?=			${CCACHE_PKG_PREFIX}/bin/ccache
 
 # Avoid depends loops between ccache and pkg
 .	if !defined(NO_CCACHE_DEPEND) && \


More information about the dev-commits-ports-main mailing list