CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan  8 10:19:35 UTC 2025

Modified Files:
        pkgsrc/mk: bsd.pkg.mk

Log Message:
mk: Fix _check-wrkdir-canonical.

The point of this test is to ensure that WRKOBJDIR is canonical, i.e. there are
no unresolved symlinks in the path.  However the test used `pwd` which does not
resolve symlinks, so was entirely useless.  Use `pwd -P` instead, which does.

Should improve the user experience so that they now get an error message
up-front rather than having to diagnose confusing wrapper failures later on.


To generate a diff of this commit:
cvs rdiff -u -r1.2057 -r1.2058 pkgsrc/mk/bsd.pkg.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/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2057 pkgsrc/mk/bsd.pkg.mk:1.2058
--- pkgsrc/mk/bsd.pkg.mk:1.2057 Tue Oct 22 06:29:21 2024
+++ pkgsrc/mk/bsd.pkg.mk        Wed Jan  8 10:19:35 2025
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2057 2024/10/22 06:29:21 jperkin Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2058 2025/01/08 10:19:35 jperkin Exp $
 #
 # This file is in the public domain.
 #
@@ -632,7 +632,7 @@ ${WRKDIR}:
 # include files. See also checkarg_sane_absolute_path in bootstrap/bootstrap.
 .PHONY: _check-wrkdir-canonical
 _check-wrkdir-canonical: ${WRKDIR}
-       ${RUN} cd ${WRKDIR}; d=`exec pwd`; ${TEST} "$$d" = ${WRKDIR}    \
+       ${RUN} cd ${WRKDIR}; d=`exec pwd -P`; ${TEST} "$$d" = ${WRKDIR} \
        || ${FAIL_MSG} "[bsd.pkg.mk] The path to WRKDIR ${WRKDIR} must be canonical ($$d)."
 
 # Create a symlink from ${WRKDIR} to the package directory if