CVS commit: pkgsrc/lang/go

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Mar 20 09:26:11 UTC 2021

Modified Files:
        pkgsrc/lang/go: version.mk

Log Message:
Use Go 1.16 as the default version.

macOS on ARM has had 1.16 as the default already for a while. The next
branch should have it for all OSes. Some build breakage has been fixed
already in separate commits.

ok before freeze wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/lang/go/version.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.114 pkgsrc/lang/go/version.mk:1.115
--- pkgsrc/lang/go/version.mk:1.114     Fri Mar 19 17:22:54 2021
+++ pkgsrc/lang/go/version.mk   Sat Mar 20 09:26:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.114 2021/03/19 17:22:54 bsiegert Exp $
+# $NetBSD: version.mk,v 1.115 2021/03/20 09:26:11 bsiegert Exp $
 
 #
 # If bsd.prefs.mk is included before go-package.mk in a package, then this
@@ -19,15 +19,13 @@ GO14_VERSION=       1.4.3
 .if ${OPSYS} == "NetBSD" && ${OS_VERSION:M6.*}
 # 1.9 is the last Go version to support NetBSD 6
 GO_VERSION_DEFAULT?=   19
-.elif ${OPSYS} == "Darwin" && ${MACHINE_ARCH} == "aarch64"
-GO_VERSION_DEFAULT?=   116
 .elif ${OPSYS} == "Darwin" && ${OS_VERSION:R} < 14
 # go 1.11 removed support for osx 10.8 and 10.9
 # https://github.com/golang/go/issues/23122
 # darwin version 13.4 is osx 10.9.5
 GO_VERSION_DEFAULT?=   110
 .else
-GO_VERSION_DEFAULT?=   115
+GO_VERSION_DEFAULT?=   116
 .endif
 
 .if !empty(GO_VERSION_DEFAULT)