CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct 11 10:02:54 UTC 2024

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

Log Message:
Set default Go version to 1.23.

Re-add the "go telemetry off" line that caused some breakage, but guarded
to be 1.23-only.

The only package that's still unfixed with 1.23 is wireguard-go, which does
not have a fix available upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/go/go-module.mk
cvs rdiff -u -r1.217 -r1.218 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/go-module.mk
diff -u pkgsrc/lang/go/go-module.mk:1.19 pkgsrc/lang/go/go-module.mk:1.20
--- pkgsrc/lang/go/go-module.mk:1.19    Sun Oct  6 16:29:39 2024
+++ pkgsrc/lang/go/go-module.mk Fri Oct 11 10:02:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: go-module.mk,v 1.19 2024/10/06 16:29:39 bsiegert Exp $
+# $NetBSD: go-module.mk,v 1.20 2024/10/11 10:02:54 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -53,6 +53,9 @@ MAKE_ENV+=    GOTOOLCHAIN=local
 
 .if !target(do-build)
 do-build:
+.if ${GO_VERSION_DEFAULT} >= 123
+       ${RUN} cd ${WRKSRC} && ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} telemetry off
+.endif
        ${RUN} cd ${WRKSRC} && ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v ${GO_BUILD_PATTERN}
 .endif
 

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.217 pkgsrc/lang/go/version.mk:1.218
--- pkgsrc/lang/go/version.mk:1.217     Thu Oct  3 15:41:00 2024
+++ pkgsrc/lang/go/version.mk   Fri Oct 11 10:02:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.217 2024/10/03 15:41:00 bsiegert Exp $
+# $NetBSD: version.mk,v 1.218 2024/10/11 10:02:54 bsiegert Exp $
 
 #
 # If bsd.prefs.mk is included before go-package.mk in a package, then this
@@ -16,7 +16,7 @@ GO14_VERSION= 1.4.3
 
 .include "../../mk/bsd.prefs.mk"
 
-GO_VERSION_DEFAULT?=   122
+GO_VERSION_DEFAULT?=   123
 
 .if defined(GO_VERSION_REQD)
 GOVERSSUFFIX=          ${GO_VERSION_REQD}