CVS commit: pkgsrc/mk/compiler

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon May 13 00:32:34 UTC 2024

Modified Files:
        pkgsrc/mk/compiler: ccache.mk

Log Message:
mk/compiler/ccache.mk: Add user-settable variable CCACHE_RECACHE

If set, set CCACHE_RECACHE in the build environment, instructing
ccache to not obtain results from the cache, while still saving
results.  This can be used to recover from cache corruption or to
verify that observed problems are not due to cache corruption.  (If
not set, as before.)


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/compiler/ccache.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/ccache.mk
diff -u pkgsrc/mk/compiler/ccache.mk:1.42 pkgsrc/mk/compiler/ccache.mk:1.43
--- pkgsrc/mk/compiler/ccache.mk:1.42   Tue Jun 27 10:27:21 2023
+++ pkgsrc/mk/compiler/ccache.mk        Mon May 13 00:32:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.42 2023/06/27 10:27:21 riastradh Exp $
+# $NetBSD: ccache.mk,v 1.43 2024/05/13 00:32:34 gdt Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -46,6 +46,14 @@
 #       doing to the specified file. This is useful for tracking down
 #       problems.
 #
+#
+# CCACHE_RECACHE
+#
+#       If set, instruct ccache to not use cached values, but to store
+#       the results.  This can be used temporarily to recover from
+#       cache corruption, or to verify that removing cache corruption
+#       as a possibility does not change the problem one is chasing.
+#
 # Package-settable variables:
 #
 # IGNORE_CCACHE
@@ -66,7 +74,7 @@
 COMPILER_CCACHE_MK=    defined
 
 _VARGROUPS+=           ccache
-_USER_VARS.ccache=     CCACHE_BASE CCACHE_DIR CCACHE_LOGFILE
+_USER_VARS.ccache=     CCACHE_BASE CCACHE_DIR CCACHE_LOGFILE CCACHE_RECACHE
 _PKG_VARS.ccache=      IGNORE_CCACHE
 
 .include "../bsd.fast.prefs.mk"
@@ -151,6 +159,9 @@ PKGSRC_MAKE_ENV+=   CCACHE_PATH=${CCPATH:H
 .ifdef CCACHE_LOGFILE
 PKGSRC_MAKE_ENV+=      CCACHE_LOGFILE=${CCACHE_LOGFILE:Q}
 .endif
+.ifdef CCACHE_RECACHE
+PKGSRC_MAKE_ENV+=      CCACHE_RECACHE=true
+.endif
 
 # Create symlinks for the compiler into ${WRKDIR}.
 .  for _var_ in ${_CCACHE_VARS}