CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 29 13:10:11 UTC 2024

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

Log Message:
go: Fix the telemetry stuff.

Didn't work for packages that set GO_VERSION_REQD.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/go/go-module.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.20 pkgsrc/lang/go/go-module.mk:1.21
--- pkgsrc/lang/go/go-module.mk:1.20    Fri Oct 11 10:02:54 2024
+++ pkgsrc/lang/go/go-module.mk Tue Oct 29 13:10:11 2024
@@ -1,4 +1,4 @@
-# $NetBSD: go-module.mk,v 1.20 2024/10/11 10:02:54 bsiegert Exp $
+# $NetBSD: go-module.mk,v 1.21 2024/10/29 13:10:11 jperkin Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -53,10 +53,10 @@ 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}
+       ${RUN} cd ${WRKSRC} && ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} \
+               ${GO} telemetry off >/dev/null 2>&1 || ${TRUE}
+       ${RUN} cd ${WRKSRC} && ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} \
+               ${GO} install -v ${GO_BUILD_PATTERN}
 .endif
 
 .if !target(do-test)