CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 26 03:25:36 UTC 2024

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

Log Message:
bsd.prefs.mk: Set OBJECT_FMT for Darwin before cross variables.

This way it can be handled by the cross variable logic when the host
and target have misatched object formats, like building NetBSD
packages (ELF) on macOS (Mach-O).

This whole stanza can be removed when PR pkg/57837
(bootstrap-mk-files bsd.own.mk defines wrong OBJECT_FMT on macOS
(Darwin), https://gnats.NetBSD.org/57837) is fixed.

No functional change intended so far -- this just makes subsequent
patches easier to follow.


To generate a diff of this commit:
cvs rdiff -u -r1.437 -r1.438 pkgsrc/mk/bsd.prefs.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.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.437 pkgsrc/mk/bsd.prefs.mk:1.438
--- pkgsrc/mk/bsd.prefs.mk:1.437        Sat Jan 13 20:21:23 2024
+++ pkgsrc/mk/bsd.prefs.mk      Fri Jan 26 03:25:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.437 2024/01/13 20:21:23 riastradh Exp $
+# $NetBSD: bsd.prefs.mk,v 1.438 2024/01/26 03:25:36 riastradh Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -341,6 +341,11 @@ MACHINE_PLATFORM?=         ${OPSYS}-${OS_VERSIO
 NATIVE_MACHINE_GNU_PLATFORM?=  ${NATIVE_MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS:C/[0-9]//g}${NATIVE_APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${NATIVE_APPEND_ABI}
 MACHINE_GNU_PLATFORM?=         ${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS:C/[0-9]//g}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
 
+# Set this before <bsd.own.mk> does, since it doesn't know about Darwin
+.if ${OPSYS} == "Darwin"
+OBJECT_FMT?=           Mach-O
+.endif
+
 #
 # cross-libtool is special -- it is built as a native package, but it
 # needs tools set up as if for a cross-compiled package because it
@@ -376,11 +381,6 @@ NEED_OWN_INSTALL_TARGET=no
 USETOOLS=              no
 MAKE_ENV+=             USETOOLS=no
 
-# Set this before <bsd.own.mk> does, since it doesn't know about Darwin
-.if ${OPSYS} == "Darwin"
-OBJECT_FMT?=           Mach-O
-.endif
-
 ACCEPTABLE_LICENSES?=  ${DEFAULT_ACCEPTABLE_LICENSES}
 
 # Provide PKGPATH early on so that mk.conf can use it.