CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jul  8 13:53:42 UTC 2018

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

Log Message:
Move definition of $GO to version.mk.

We have some packages, like mongodb-tools, that cannot include go-package.mk
but need to call the go tool.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/go/go-package.mk
cvs rdiff -u -r1.38 -r1.39 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-package.mk
diff -u pkgsrc/lang/go/go-package.mk:1.13 pkgsrc/lang/go/go-package.mk:1.14
--- pkgsrc/lang/go/go-package.mk:1.13   Sun Jul  8 12:55:00 2018
+++ pkgsrc/lang/go/go-package.mk        Sun Jul  8 13:53:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.13 2018/07/08 12:55:00 bsiegert Exp $
+# $NetBSD: go-package.mk,v 1.14 2018/07/08 13:53:42 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -51,11 +51,6 @@
 
 .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}/...

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.38 pkgsrc/lang/go/version.mk:1.39
--- pkgsrc/lang/go/version.mk:1.38      Tue Jun 12 17:37:59 2018
+++ pkgsrc/lang/go/version.mk   Sun Jul  8 13:53:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.38 2018/06/12 17:37:59 bsiegert Exp $
+# $NetBSD: version.mk,v 1.39 2018/07/08 13:53:42 bsiegert Exp $
 
 SSP_SUPPORTED= no
 
@@ -7,6 +7,10 @@ SSP_SUPPORTED= no
 GO_VERSION=    1.10.3
 GO14_VERSION=  1.4.3
 
+# How to find the Go tool
+GOVERSSUFFIX?=
+GO=                    ${PREFIX}/go${GOVERSSUFFIX}/bin/go
+
 ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64 *-*-earmv[67]hf
 NOT_FOR_PLATFORM=      SunOS-*-i386
 .if ${MACHINE_ARCH} == "i386"