CVS commit: pkgsrc/mk/check

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 10:27:54 UTC 2023

Modified Files:
        pkgsrc/mk/check: check-wrkref.mk

Log Message:
check-wrkref: Check for TOOLBASE references when it's not LOCALBASE.

No change for native compilation, where TOOLBASE = LOCALBASE.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/check/check-wrkref.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/check/check-wrkref.mk
diff -u pkgsrc/mk/check/check-wrkref.mk:1.27 pkgsrc/mk/check/check-wrkref.mk:1.28
--- pkgsrc/mk/check/check-wrkref.mk:1.27        Sat Mar  4 23:03:34 2023
+++ pkgsrc/mk/check/check-wrkref.mk     Tue Jun 27 10:27:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.27 2023/03/04 23:03:34 rillig Exp $
+# $NetBSD: check-wrkref.mk,v 1.28 2023/06/27 10:27:54 riastradh Exp $
 #
 # This file checks that the installed files don't contain any strings
 # that point to the directory where the package had been built, to make
@@ -19,8 +19,9 @@
 #              pkgsrc          PKGSRCDIR
 #              buildlink       BUILDLINK_DIR and BUILDLINK_X11_DIR
 #              extra           see CHECK_WRKREF_EXTRA_DIRS
+#              cross           TOOLBASE (only if distinct from LOCALBASE)
 #
-#      Default value: "tools home" for PKG_DEVELOPERs, "no" otherwise.
+#      Default value: "tools home cross" for PKG_DEVELOPERs, "no" otherwise.
 #
 #      The "buildlink" option works best in combination with
 #      STRIP_DEBUG=yes.
@@ -43,7 +44,7 @@ _USER_VARS.check-wrkref=      CHECK_WRKREF CH
 _PKG_VARS.check-wrkref=                CHECK_WRKREF_SKIP
 
 .if ${PKG_DEVELOPER:Uno} != "no"
-CHECK_WRKREF?=         tools home
+CHECK_WRKREF?=         tools home cross
 .else
 CHECK_WRKREF?=         no
 .endif
@@ -64,13 +65,15 @@ _CHECK_WRKREF_DIR.buildlink=        ${BUILDLINK
 _CHECK_WRKREF_DIR.buildlink+=  ${BUILDLINK_X11_DIR}
 .endif
 _CHECK_WRKREF_DIR.extra=       ${CHECK_WRKREF_EXTRA_DIRS}
+_CHECK_WRKREF_DIR.cross=       \
+       ${${TOOLBASE} != ${LOCALBASE}:?${TOOLBASE}:}
 
 _CHECK_WRKREF_DIRS=    # none
 .for d in ${CHECK_WRKREF}
 .  if !defined(_CHECK_WRKREF_DIR.${d})
 PKG_FAIL_REASON+=      "[check-wrkref.mk] Invalid value \"${d:Q}\" for CHECK_WRKREF."
 PKG_FAIL_REASON+=      "[check-wrkref.mk] Valid options are:"
-.    for refvar in work tools wrappers home wrkobjdir wrksrc pkgsrc buildlink extra
+.    for refvar in work tools wrappers home wrkobjdir wrksrc pkgsrc buildlink extra cross
 PKG_FAIL_REASON+=      "[check-wrkref.mk]      ${refvar}"
 .    endfor
 .  else