CVS commit: pkgsrc/mk

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

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

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

Log Message:
bsd.prefs.mk: Use CROSS_ABI or nothing as ABI when cross-building.

This way, when you use the mk.conf generated by bootstrap on amd64 to
cross-build for other architectures, the ABI=64 setting that
bootstrap put in mk.conf doesn't break it.

No change to native builds because this is conditional on
TOOLS_USE_CROSS_COMPILE = yes.  (Needed for cross-libtool-base build
too, so this is conditional on TOOLS_USE_CROSS_COMPILE rather than on
USE_CROSS_COMPILE.)


To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 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.443 pkgsrc/mk/bsd.prefs.mk:1.444
--- pkgsrc/mk/bsd.prefs.mk:1.443        Fri Apr 12 19:56:03 2024
+++ pkgsrc/mk/bsd.prefs.mk      Fri Apr 12 19:57:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.443 2024/04/12 19:56:03 riastradh Exp $
+# $NetBSD: bsd.prefs.mk,v 1.444 2024/04/12 19:57:24 riastradh Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -704,6 +704,13 @@ LOCALBASE=         ${CROSS_LOCALBASE:U/usr/pkg}
 VARBASE=               ${CROSS_VARBASE:U/var}
 SYSCONFBASE=           ${CROSS_SYSCONFBASE:U/etc}
 .endif
+.if ${TOOLS_USE_CROSS_COMPILE:tl} == "yes"
+.  if defined(CROSS_ABI)
+ABI=                   ${CROSS_ABI}
+.  else
+.    undef ABI
+.  endif
+.endif
 X11_TYPE?=             modular
 .if !empty(X11_TYPE:Mnative)
 .  if ${OPSYS} == "SunOS"