CVS commit: pkgsrc/mk/tools

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 22 19:00:07 UTC 2021

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

Log Message:
mk: Use native bsdtar on NetBSD 9.0 onwards.

Relying on native variables like MKBSDTAR only works when using the native
make, and should be avoided as they are not set when using a bootstrap.

Should fix build of lang/go117 with bootstrapped NetBSD, as bsdtar from
pkgsrc is unable to handle the distfile due to locale errors.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/mk/tools/tools.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/tools/tools.NetBSD.mk
diff -u pkgsrc/mk/tools/tools.NetBSD.mk:1.67 pkgsrc/mk/tools/tools.NetBSD.mk:1.68
--- pkgsrc/mk/tools/tools.NetBSD.mk:1.67        Tue Feb 25 11:20:28 2020
+++ pkgsrc/mk/tools/tools.NetBSD.mk     Fri Oct 22 19:00:06 2021
@@ -1,11 +1,11 @@
-# $NetBSD: tools.NetBSD.mk,v 1.67 2020/02/25 11:20:28 tnn Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.68 2021/10/22 19:00:06 jperkin Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
 TOOLS_PLATFORM.[?=             [                       # shell builtin
 TOOLS_PLATFORM.awk?=           /usr/bin/awk
 TOOLS_PLATFORM.basename?=      /usr/bin/basename
-.if !empty(MKBSDTAR:U:Myes)
+.if empty(MACHINE_PLATFORM:MNetBSD-[0-8].*) || !empty(MKBSDTAR:U:Myes)
 TOOLS_PLATFORM.bsdtar?=                /bin/tar
 .endif
 TOOLS_PLATFORM.byacc?=         /usr/bin/yacc