CVS commit: pkgsrc/lang/go

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Jan 28 12:34:30 UTC 2023

Modified Files:
        pkgsrc/lang/go: bootstrap.mk version.mk

Log Message:
go: Switch illumos platforms to native GOOS=illumos.

Ensures that native interfaces such as flock(3C) that aren't available on
Solaris can be used.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/go/bootstrap.mk
cvs rdiff -u -r1.169 -r1.170 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/bootstrap.mk
diff -u pkgsrc/lang/go/bootstrap.mk:1.8 pkgsrc/lang/go/bootstrap.mk:1.9
--- pkgsrc/lang/go/bootstrap.mk:1.8     Wed Mar  9 15:15:59 2022
+++ pkgsrc/lang/go/bootstrap.mk Sat Jan 28 12:34:30 2023
@@ -1,7 +1,9 @@
-# $NetBSD: bootstrap.mk,v 1.8 2022/03/09 15:15:59 bacon Exp $
+# $NetBSD: bootstrap.mk,v 1.9 2023/01/28 12:34:30 jperkin Exp $
 
 .if !defined(GOROOT_BOOTSTRAP) || !exists(${GOROOT_BOOTSTRAP}/bin/go)
-.  if ${MACHINE_ARCH} == "aarch64" || ${OPSYS} == "Darwin" && ${OPSYS_VERSION} >= 120000
+.  if ${MACHINE_ARCH} == "aarch64" || \
+    (${OPSYS} == "Darwin" && ${OPSYS_VERSION} >= 120000) || \
+    (${OPSYS} == "SunOS" && ${OS_VARIANT} != "Solaris")
 BUILD_DEPENDS+=                go-bin-[0-9]*:../../lang/go-bin
 GOROOT_BOOTSTRAP=      ${PREFIX}/go-bin
 .  else

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.169 pkgsrc/lang/go/version.mk:1.170
--- pkgsrc/lang/go/version.mk:1.169     Wed Jan 11 17:24:29 2023
+++ pkgsrc/lang/go/version.mk   Sat Jan 28 12:34:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.169 2023/01/11 17:24:29 bsiegert Exp $
+# $NetBSD: version.mk,v 1.170 2023/01/28 12:34:30 jperkin Exp $
 
 #
 # If bsd.prefs.mk is included before go-package.mk in a package, then this
@@ -50,7 +50,13 @@ GOOPT=                       GOARM=6
 .elif ${MACHINE_ARCH} == "earmv7hf"
 GOOPT=                 GOARM=7
 .endif
+
+.if ${OPSYS} == "SunOS" && ${OS_VARIANT} != "Solaris"
+GO_PLATFORM=           illumos_${GOARCH}
+.else
 GO_PLATFORM=           ${LOWER_OPSYS}_${GOARCH}
+.endif
+
 PLIST_SUBST+=          GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q}
 PLIST_SUBST+=          GOCHAR=${GOCHAR:Q}