CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec  9 09:59:31 UTC 2019

Modified Files:
        pkgsrc/lang/go: version.mk
Added Files:
        pkgsrc/lang/go: go-vars.mk

Log Message:
go: Split *_SUPPORTED variables out into new go-vars.mk.

It's not always possible to include go-package.mk earlier than bsd.prefs.mk
in a package, for example if the package defines its own do-install target,
so move out the *_SUPPORTED variables that need to be included first.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/go/go-vars.mk
cvs rdiff -u -r1.73 -r1.74 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/version.mk
diff -u pkgsrc/lang/go/version.mk:1.73 pkgsrc/lang/go/version.mk:1.74
--- pkgsrc/lang/go/version.mk:1.73      Sun Dec  8 14:42:02 2019
+++ pkgsrc/lang/go/version.mk   Mon Dec  9 09:59:31 2019
@@ -1,10 +1,10 @@
-# $NetBSD: version.mk,v 1.73 2019/12/08 14:42:02 bsiegert Exp $
+# $NetBSD: version.mk,v 1.74 2019/12/09 09:59:31 jperkin Exp $
 
-CTF_SUPPORTED=         no
-SSP_SUPPORTED=         no
-STRIP_DEBUG_SUPPORTED= no
-
-.include "../../mk/bsd.prefs.mk"
+#
+# If bsd.prefs.mk is included before go-package.mk in a package, then this
+# file must be included directly in the package prior to bsd.prefs.mk.
+#
+.include "go-vars.mk"
 
 GO113_VERSION= 1.13.5
 GO112_VERSION= 1.12.12
@@ -14,6 +14,8 @@ GO19_VERSION= 1.9.7
 GO14_VERSION=  1.4.3
 GO_VERSION=    ${GO110_VERSION}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "NetBSD" && ${OS_VERSION:M6.*}
 # 1.9 is the last Go version to support NetBSD 6
 GO_VERSION_DEFAULT?=   19

Added files:

Index: pkgsrc/lang/go/go-vars.mk
diff -u /dev/null pkgsrc/lang/go/go-vars.mk:1.1
--- /dev/null   Mon Dec  9 09:59:31 2019
+++ pkgsrc/lang/go/go-vars.mk   Mon Dec  9 09:59:31 2019
@@ -0,0 +1,19 @@
+# $NetBSD: go-vars.mk,v 1.1 2019/12/09 09:59:31 jperkin Exp $
+#
+# Makefile fragment to be included by any package that uses go-package.mk.
+#
+# This needs to be included before bsd.prefs.mk, as the variables set in this
+# file are used there to determine whether certain features should be enabled
+# or not.
+#
+# go-package.mk itself can't always be included before bsd.prefs.mk as it
+# provides some default targets such as do-install if the package has not
+# already defined its own.
+#
+
+#
+# go uses its own special linker which does not at this time support CTF/SSP.
+#
+CTF_SUPPORTED=         no
+SSP_SUPPORTED=         no
+STRIP_DEBUG_SUPPORTED= no