CVS commit: pkgsrc/mk

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

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

Modified Files:
        pkgsrc/mk: bsd.prefs.mk
        pkgsrc/mk/defaults: mk.conf

Log Message:
mk: Use MACHINE_PLATFORM, not MACHINE_ARCH, for work/packages.

Fix bogus default PACKAGES setting -- this was shadowed by the one in
mk/defaults/mk.conf, so it never took effect.

No change to native builds because this logic is conditional on
USE_CROSS_COMPILE = yes.


To generate a diff of this commit:
cvs rdiff -u -r1.441 -r1.442 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.344 -r1.345 pkgsrc/mk/defaults/mk.conf

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.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.441 pkgsrc/mk/bsd.prefs.mk:1.442
--- pkgsrc/mk/bsd.prefs.mk:1.441        Fri Apr 12 19:54:44 2024
+++ pkgsrc/mk/bsd.prefs.mk      Fri Apr 12 19:55:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.441 2024/04/12 19:54:44 riastradh Exp $
+# $NetBSD: bsd.prefs.mk,v 1.442 2024/04/12 19:55:16 riastradh Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -824,12 +824,10 @@ MAKEFLAGS+=               _PKGSRCDIR=${_PKGSRCDIR:Q}
 .endif
 PKGSRCDIR=             ${_PKGSRCDIR}
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-_CROSSDIR_SUFFIX=      .${MACHINE_ARCH}
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+_CROSSDIR_SUFFIX=      .${MACHINE_PLATFORM}
 .endif
 
-DISTDIR?=              ${PKGSRCDIR}/distfiles
-PACKAGES?=             ${PKGSRCDIR}/packages${_CROSSDIR_SUFFIX}
 TEMPLATES?=            ${PKGSRCDIR}/templates
 
 PATCHDIR?=             ${.CURDIR}/patches

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.344 pkgsrc/mk/defaults/mk.conf:1.345
--- pkgsrc/mk/defaults/mk.conf:1.344    Fri Mar  1 13:37:06 2024
+++ pkgsrc/mk/defaults/mk.conf  Fri Apr 12 19:55:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.344 2024/03/01 13:37:06 schmonz Exp $
+# $NetBSD: mk.conf,v 1.345 2024/04/12 19:55:16 riastradh Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -524,10 +524,11 @@ RCD_SCRIPTS_DIR?= ${SYSCONFBASE}/rc.d
 # Possible: any path you like
 # Default: ${SYSCONFBASE}/rc.d
 
-PACKAGES?=     ${PKGSRCDIR}/packages
+PACKAGES?=     ${PKGSRCDIR}/packages${${USE_CROSS_COMPILE:tl} == "yes":?.${MACHINE_PLATFORM}:}
 # Stores generated packages
 # Possible: any path you like
-# Default: ${PKGSRCDIR}/packages
+# Default: ${PKGSRCDIR}/packages, or ${PKGSRCDIR}/packages.${MACHINE_PLATFORM}
+# if cross-compiling.
 
 #PASSIVE_FETCH=
 # Use ftp(1) in passive mode, for use behind filtering firewalls.