CVS commit: pkgsrc/mk/check

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Jun 14 10:28:46 UTC 2023

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

Log Message:
check-interpreter: Check for interpreters in cross destdir.

Otherwise, if you have cross-compiled the interpreter and it exists
exists at /usr/obj/destdir.evbarm/usr/pkg/bin/interp but not at
/usr/pkg/bin/interp on the build machine, check-interpreter will
spuriously complain.

Or, if it exists at /usr/pkg/bin/interp but _hasn't_ been
cross-compiled, check-interpreter will fail to complain.

No change for native compilation.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mk/check/check-interpreter.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-interpreter.mk
diff -u pkgsrc/mk/check/check-interpreter.mk:1.33 pkgsrc/mk/check/check-interpreter.mk:1.34
--- pkgsrc/mk/check/check-interpreter.mk:1.33   Wed May 31 20:18:08 2023
+++ pkgsrc/mk/check/check-interpreter.mk        Wed Jun 14 10:28:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: check-interpreter.mk,v 1.33 2023/05/31 20:18:08 rillig Exp $
+# $NetBSD: check-interpreter.mk,v 1.34 2023/06/14 10:28:46 riastradh Exp $
 #
 # This file checks that after installation, all files of the package
 # that start with a "#!" line will find their interpreter. Files that
@@ -81,7 +81,7 @@ _check-interpreter: error-check .PHONY
                        continue;;                                      \
                esac;                                                   \
                if { [ ! -f ${DESTDIR:Q}"$$interp" ] &&                 \
-                    [ ! -f "$$interp" ]; }; then                       \
+                    [ ! -f ${_CROSS_DESTDIR:U:Q}"$$interp" ]; }; then  \
                        ${DELAYED_ERROR_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
                fi;                                                     \
        done