CVS commit: pkgsrc/mk/platform

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:56:40 UTC 2024

Modified Files:
        pkgsrc/mk/platform: NetBSD.mk

Log Message:
mk/platform/NetBSD.mk: Make default cross-built PKG_TOOLS_BIN nicer.

`bootstrap --prefix /home/user/pkg' will create an mk.conf with
PKG_TOOLS_BIN=/home/user/pkg/sbin, but if you are using that
installation to cross-build packages, you likely want the default
cross-built PKG_TOOLS_BIN to be /usr/pkg/sbin just like the default
cross-built LOCALBASE is /usr/pkg.  This change implements that.

You can still override the cross-built PKG_TOOLS_BIN by setting
CROSS_PKG_TOOLS_BIN in mk.conf.

No change to native builds because the changed part is conditional on
USE_CROSS_COMPILE = yes.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/mk/platform/NetBSD.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/platform/NetBSD.mk
diff -u pkgsrc/mk/platform/NetBSD.mk:1.79 pkgsrc/mk/platform/NetBSD.mk:1.80
--- pkgsrc/mk/platform/NetBSD.mk:1.79   Wed Nov 15 14:14:09 2023
+++ pkgsrc/mk/platform/NetBSD.mk        Fri Apr 12 19:56:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.79 2023/11/15 14:14:09 nia Exp $
+# $NetBSD: NetBSD.mk,v 1.80 2024/04/12 19:56:40 riastradh Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -35,7 +35,11 @@ NOLOGIN?=            /sbin/nologin
 # This must be lazy and using :? evaluation doesn't work due to a make bugs.
 NATIVE_PKG_TOOLS_BIN_cmd=      if [ -x ${TOOLBASE}/sbin/pkg_info ]; then echo ${TOOLBASE}/sbin; else echo /usr/sbin; fi
 NATIVE_PKG_TOOLS_BIN?=         ${NATIVE_PKG_TOOLS_BIN_cmd:sh}
-PKG_TOOLS_BIN?=                        ${"${USE_CROSS_COMPILE:U:tl}" == "yes":?${CROSS_PKG_TOOLS_BIN:U/usr/sbin}:${NATIVE_PKG_TOOLS_BIN}}
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+PKG_TOOLS_BIN=                 ${CROSS_PKG_TOOLS_BIN:U/usr/sbin}
+.else
+PKG_TOOLS_BIN?=                        ${NATIVE_PKG_TOOLS_BIN}
+.endif
 ROOT_CMD?=             ${SU} - root -c
 ROOT_USER?=            root
 ROOT_GROUP?=   wheel