Expand CHECK_SSP_SKIP to fix build on at least SunOS. Handle a PLIST divergence for SunOS.

[Filip Hajny <filip%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Mon Feb 26 12:21:41 2018 +0000
Changeset:	1a7508c3308301588e2cfbea085cfb4ca8b415a2

Modified Files:
	go/Makefile
	go/PLIST

Log Message:
Expand CHECK_SSP_SKIP to fix build on at least SunOS.
Handle a PLIST divergence for SunOS.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a7508c3308301588e2cfbea085cfb4ca8b415a2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 go/Makefile | 7 ++++++-
 go/PLIST    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs:
diff --git a/go/Makefile b/go/Makefile
index 23dcec44cf..a3c034ad8a 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -69,6 +69,7 @@ CHECK_RELRO_SKIP+=		go/pkg/bootstrap/bin/compile
 CHECK_RELRO_SKIP+=		go/pkg/bootstrap/bin/link
 # also does not support SSP at this time
 CHECK_SSP_SKIP=			${CHECK_RELRO_SKIP}
+CHECK_SSP_SKIP+=		go/pkg/bootstrap/bin/cgo
 
 # uses /bin/rc (for Plan 9)
 CHECK_INTERPRETER_SKIP+=	go/include/plan9/mklibc.rc
@@ -82,7 +83,11 @@ GOROOT_BOOTSTRAP=	${PREFIX}/go14
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=	route
+PLIST_VARS+=	pty route
+
+.if ${OPSYS} != "SunOS"
+PLIST.pty=	yes
+.endif
 
 .if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
 PLIST.route=	yes
diff --git a/go/PLIST b/go/PLIST
index 5a57b1ed33..dc5472f58a 100644
--- a/go/PLIST
+++ b/go/PLIST
@@ -1321,7 +1321,7 @@ go/pkg/${GO_PLATFORM}/net/url.a
 go/pkg/${GO_PLATFORM}/os.a
 go/pkg/${GO_PLATFORM}/os/exec.a
 go/pkg/${GO_PLATFORM}/os/signal.a
-go/pkg/${GO_PLATFORM}/os/signal/internal/pty.a
+${PLIST.pty}go/pkg/${GO_PLATFORM}/os/signal/internal/pty.a
 go/pkg/${GO_PLATFORM}/os/user.a
 go/pkg/${GO_PLATFORM}/path.a
 go/pkg/${GO_PLATFORM}/path/filepath.a