CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Feb 11 19:28:18 UTC 2024

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

Log Message:
go-module, go-package: set GOTOOLCHAIN=local

>From version 1.21 on, Go has built-in support for additional toolchains.
If the installed Go version is too old, it can download and use a newer
version on the fly during the build.

See https://tip.golang.org/doc/toolchain for details.

Needless to say, we don't want this to happen during a pkgsrc build.
This setting disables the behavior and always uses the bundled toolchain.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/go/go-module.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/go/go-package.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.10 pkgsrc/lang/go/go-module.mk:1.11
--- pkgsrc/lang/go/go-module.mk:1.10    Tue Jun  6 12:41:44 2023
+++ pkgsrc/lang/go/go-module.mk Sun Feb 11 19:28:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: go-module.mk,v 1.10 2023/06/06 12:41:44 riastradh Exp $
+# $NetBSD: go-module.mk,v 1.11 2024/02/11 19:28:18 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -43,6 +43,7 @@ PRINT_PLIST_AWK+=     /^@pkgdir bin$$/ { nex
 
 MAKE_ENV+=     GO111MODULE=on GOPATH=${WRKDIR}/.gopath GOPROXY=file://${WRKDIR}/.goproxy
 MAKE_ENV+=     GOCACHE=${WRKDIR}/.cache/go-build
+MAKE_ENV+=     GOTOOLCHAIN=local
 
 .if !target(do-build)
 do-build:

Index: pkgsrc/lang/go/go-package.mk
diff -u pkgsrc/lang/go/go-package.mk:1.27 pkgsrc/lang/go/go-package.mk:1.28
--- pkgsrc/lang/go/go-package.mk:1.27   Tue Jun  6 12:41:44 2023
+++ pkgsrc/lang/go/go-package.mk        Sun Feb 11 19:28:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.27 2023/06/06 12:41:44 riastradh Exp $
+# $NetBSD: go-package.mk,v 1.28 2024/02/11 19:28:18 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -73,6 +73,7 @@ PRINT_PLIST_AWK+=     /^@pkgdir gopkg$$/ { n
 MAKE_ENV+=     GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg
 MAKE_ENV+=     GOCACHE=${WRKDIR}/.cache/go-build
 MAKE_ENV+=     GO111MODULE=off
+MAKE_ENV+=     GOTOOLCHAIN=local
 
 .if !target(post-extract)
 post-extract: