CVS commit: pkgsrc/pkgtools/varcache

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 11 18:06:14 UTC 2026

Modified Files:
        pkgsrc/pkgtools/varcache: Makefile

Log Message:
varcache: add a builtin variable and some more computed variables


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/varcache/Makefile

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

Modified files:

Index: pkgsrc/pkgtools/varcache/Makefile
diff -u pkgsrc/pkgtools/varcache/Makefile:1.1 pkgsrc/pkgtools/varcache/Makefile:1.2
--- pkgsrc/pkgtools/varcache/Makefile:1.1       Fri Jan  9 14:40:02 2026
+++ pkgsrc/pkgtools/varcache/Makefile   Sun Jan 11 18:06:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/01/09 14:40:02 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2026/01/11 18:06:14 wiz Exp $
 #
 # This is not a normal package, it is a standalone Makefile to help generate
 # varcache entries that speed up builds by precomputing expensive variables.
@@ -17,12 +17,17 @@ BUILTINS!=  ls -1 ../../*/*/builtin.mk ..
 # Be specific about which matches we want to include.  We would rather be
 # missing a few variables than include anything which could cause problems.
 #
-VC_MATCH:=     ^(BUILTIN_LIB_FOUND|BUILTIN_PKG|FIND_FILES)
+VC_MATCH:=     ^(BUILTIN_LIB_FOUND|BUILTIN_OPENSSL|BUILTIN_PKG|FIND_FILES)
 VC_MATCH:=     ${VC_MATCH}|^(H_|PC_|SH_|_BLTN_H_)
 VC_MATCH:=     ${VC_MATCH}|(DBM_H |_DRV |_PC )
 VC_MATCH:=     ${VC_MATCH}|^(BIN|BINUTILS)_FILE
 VC_MATCH:=     ${VC_MATCH}|^(XAUTH|XINIT)
 
+VC_VARS+=      HOST_OSTYPE
+VC_VARS+=      PKGTOOLS_VERSION
+VC_VARS+=      _GCC_VERSION
+VC_VARS+=      _PKGSRCDIR
+
 #
 # With X11_TYPE=modular we could end up with a situation where an X11 pkgsrc
 # package happens to be installed, and will then be detected as a builtin due
@@ -34,6 +39,10 @@ VC_MATCH:=   ${VC_MATCH}|^(XAUTH|XINIT)
 X11BASE:=      /nonexistent
 
 show-varcache:
+.for _var_ in ${VC_VARS}
+       @echo -n ${_var_}=
+       @${MAKE} show-var VARNAME=${_var_}
+.endfor
        @{ ${MAKEVARS:@t@ \
                printf "%s %s\n" ${t:Q} ${${t:Q}:Q}; \
                @} } | ${SORT} | uniq | ${EGREP} ${VC_MATCH:Q} \