CVS commit: pkgsrc/mk/pkgformat/pkg

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:57:34 UTC 2024

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

Log Message:
mk/pkgformat/pkg: When updating pkg_install, don't cross-build it.

Also clear the same variables that are cleared on recursive package
builds to avoid leakage.  Generally, make this all better match the
logic in DEPENDS_INSTALL_CMD.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 pkgsrc/mk/pkgformat/pkg/depends.mk:1.22
--- pkgsrc/mk/pkgformat/pkg/depends.mk:1.21     Fri Apr 12 19:55:29 2024
+++ pkgsrc/mk/pkgformat/pkg/depends.mk  Fri Apr 12 19:57:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.21 2024/04/12 19:55:29 riastradh Exp $
+# $NetBSD: depends.mk,v 1.22 2024/04/12 19:57:34 riastradh Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -225,11 +225,22 @@ _pkgformat-post-install-dependencies: .P
 pkg_install-depends:
        ${RUN}if [ `${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302` -lt ${PKGTOOLS_REQD} ]; then \
        ${PHASE_MSG} "Trying to handle out-dated pkg_install..."; \
-       cd ../../pkgtools/pkg_install && ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \
-           _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" \
+       case "${USE_CROSS_COMPILE:Unu:tl}" in \
+       yes)    extradep="";; \
+       *)      extradep=" ${PKGNAME}";; \
+       esac; \
+       unset _PKGSRC_BARRIER || true; \
+       unset MAKEFLAGS || true; \
+       unset ${CROSSVARS:@_v_@TARGET_${_v_}@} || true; \
+       cd ../../pkgtools/pkg_install && \
+       ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} PATH=${_PATH_ORIG:Q} \
+           _PKGSRC_DEPS="$$extradep${_PKGSRC_DEPS}" \
+           USE_CROSS_COMPILE=no \
            ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes clean && \
-       cd ../../pkgtools/pkg_install && ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \
-           _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" \
+       cd ../../pkgtools/pkg_install && \
+       ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} PATH=${_PATH_ORIG:Q} \
+           _PKGSRC_DEPS="$$extradep${_PKGSRC_DEPS}" \
+           USE_CROSS_COMPILE=no \
            ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes ${DEPENDS_TARGET:Q}; \
        fi