CVS commit: pkgsrc/mk/pkgformat/pkg

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:55:29 UTC 2024

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

Log Message:
mk/pkgformat/pkg: Handle OBJECT_FMT mismatch in cross builds.

No change to native builds because OBJECT_FMT = NATIVE_OBJECT_FMT in
native builds.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 pkgsrc/mk/pkgformat/pkg/depends.mk:1.21
--- pkgsrc/mk/pkgformat/pkg/depends.mk:1.20     Fri Apr 12 19:54:44 2024
+++ pkgsrc/mk/pkgformat/pkg/depends.mk  Fri Apr 12 19:55:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.20 2024/04/12 19:54:44 riastradh Exp $
+# $NetBSD: depends.mk,v 1.21 2024/04/12 19:55:29 riastradh Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -162,16 +162,18 @@ _DEPENDS_INSTALL_CMD=                                                     \
        *)                                                              \
                case $$type in                                          \
                bootstrap|tool)                                         \
-                       objfmt=`${HOST_PKG_INFO} -Q OBJECT_FMT "$$pkg"`;; \
+                       objfmt=`${HOST_PKG_INFO} -Q OBJECT_FMT "$$pkg"`; \
+                       needobjfmt=${NATIVE_OBJECT_FMT:Q};;             \
                build|test|full)                                        \
-                       objfmt=`${PKG_INFO} -Q OBJECT_FMT "$$pkg"`;;    \
+                       objfmt=`${PKG_INFO} -Q OBJECT_FMT "$$pkg"`;     \
+                       needobjfmt=${OBJECT_FMT:Q};;                    \
                esac;                                                   \
                case "$$objfmt" in                                      \
                "")     ${WARNING_MSG} "[depends.mk] Unknown object format for installed package $$pkg" ;; \
-               ${OBJECT_FMT})  ;;                                      \
+               $$needobjfmt)   ;;                                      \
                *)      ${ERROR_MSG} "[depends.mk] Installed package $$pkg has an"; \
-                       ${ERROR_MSG} "    object format \`\`$$objfmt'' which differs from \`\`${OBJECT_FMT}''.  Please"; \
-                       ${ERROR_MSG} "    update the $$pkg package to ${OBJECT_FMT}."; \
+                       ${ERROR_MSG} "    object format \`\`$$objfmt'' which differs from \`\`$$needobjfmt''.  Please"; \
+                       ${ERROR_MSG} "    update the $$pkg package to $$needobjfmt."; \
                        exit 1;                                         \
                        ;;                                              \
                esac;                                                   \