CVS commit: pkgsrc/mk/pkgformat/pkg

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Mar 30 22:51:23 UTC 2023

Modified Files:
        pkgsrc/mk/pkgformat/pkg: depends.mk

Log Message:
Drop environment when pulling in dependencies. This fixes test-depends.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/pkgformat/pkg/depends.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/pkgformat/pkg/depends.mk
diff -u pkgsrc/mk/pkgformat/pkg/depends.mk:1.16 pkgsrc/mk/pkgformat/pkg/depends.mk:1.17
--- pkgsrc/mk/pkgformat/pkg/depends.mk:1.16     Wed Nov 23 11:17:51 2022
+++ pkgsrc/mk/pkgformat/pkg/depends.mk  Thu Mar 30 22:51:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.16 2022/11/23 11:17:51 jperkin Exp $
+# $NetBSD: depends.mk,v 1.17 2023/03/30 22:51:23 joerg Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -131,7 +131,9 @@ _DEPENDS_INSTALL_CMD=                                                       \
                ${STEP_MSG} "Verifying $$target for $$dir";             \
                [ -d "$$dir" ] || ${FAIL_MSG} "[depends.mk] The directory \`\`$$dir'' does not exist."; \
                cd $$dir;                                               \
-               ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV}                     \
+               unset _PKGSRC_BARRIER;                                  \
+               unset MAKEFLAGS;                                        \
+               ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} PATH=${_PATH_ORIG}  \
                        _PKGSRC_DEPS="$$extradep${_PKGSRC_DEPS}"        \
                        PKGNAME_REQD="$$pattern"                        \
                        USE_CROSS_COMPILE=$$cross                       \