CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jul  8 12:55:00 UTC 2018

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

Log Message:
Use the non-symlinked go tool for package builds.

Otherwise, you will not be able to build Go code in pkgsrc if you do not
have pkg_alternatives installed.

Introduce a variable (user-settable for now) GOVERSSUFFIX.
$GO is now the Go tool with full path.

leot@ convinced me to go full Python (e.g. one directory per major version,
GO_VERSION_ACCEPTED etc.) but that will be another series of commits.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 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-package.mk
diff -u pkgsrc/lang/go/go-package.mk:1.12 pkgsrc/lang/go/go-package.mk:1.13
--- pkgsrc/lang/go/go-package.mk:1.12   Tue Jun  5 15:42:20 2018
+++ pkgsrc/lang/go/go-package.mk        Sun Jul  8 12:55:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.12 2018/06/05 15:42:20 leot Exp $
+# $NetBSD: go-package.mk,v 1.13 2018/07/08 12:55:00 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -51,6 +51,11 @@
 
 .include "../../lang/go/version.mk"
 
+# How to find the Go tool.
+GOVERSSUFFIX?=
+GO=                    ${PREFIX}/go${GOVERSSUFFIX}/bin/go
+
+
 _GO_DIST_BASE!=                basename ${GO_SRCPATH}
 GO_DIST_BASE?=         ${_GO_DIST_BASE}
 GO_BUILD_PATTERN?=     ${GO_SRCPATH}/...
@@ -79,12 +84,12 @@ post-extract:
 
 .if !target(do-build)
 do-build:
-       ${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go install -v ${GO_BUILD_PATTERN}
+       ${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg ${GO} install -v ${GO_BUILD_PATTERN}
 .endif
 
 .if !target(do-test)
 do-test:
-       ${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go test -v ${GO_BUILD_PATTERN}
+       ${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg ${GO} test -v ${GO_BUILD_PATTERN}
 .endif
 
 .if !target(do-install)