pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools mk: Use native bsdtar on NetBSD 9.0 onwards.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/deb7339853f3
branches:  trunk
changeset: 768449:deb7339853f3
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Oct 22 19:00:06 2021 +0000

description:
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.

diffstat:

 mk/tools/tools.NetBSD.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 95fba95c8624 -r deb7339853f3 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Fri Oct 22 17:12:06 2021 +0000
+++ b/mk/tools/tools.NetBSD.mk  Fri Oct 22 19:00:06 2021 +0000
@@ -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



Home | Main Index | Thread Index | Old Index