CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 30 17:05:22 UTC 2018

Modified Files:
        pkgsrc/lang/go: Makefile version.mk
        pkgsrc/lang/go14: Makefile

Log Message:
go*: Disable SSP support completely.

It's not supported by the go linker, and can cause issues when building
third-party modules if the SSP libraries are handled by pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/lang/go/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/go/version.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/go14/Makefile

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/Makefile
diff -u pkgsrc/lang/go/Makefile:1.60 pkgsrc/lang/go/Makefile:1.61
--- pkgsrc/lang/go/Makefile:1.60        Sun Jan 28 11:31:03 2018
+++ pkgsrc/lang/go/Makefile     Tue Jan 30 17:05:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2018/01/28 11:31:03 bsiegert Exp $
+# $NetBSD: Makefile,v 1.61 2018/01/30 17:05:21 jperkin Exp $
 
 .include "version.mk"
 
@@ -71,8 +71,6 @@ CHECK_RELRO_SKIP+=            go/bin/gofmt
 CHECK_RELRO_SKIP+=             go/pkg/bootstrap/bin/asm
 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}
 
 # uses /bin/rc (for Plan 9)
 CHECK_INTERPRETER_SKIP+=       go/include/plan9/mklibc.rc

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.32 pkgsrc/lang/go/version.mk:1.33
--- pkgsrc/lang/go/version.mk:1.32      Sun Jan 28 11:31:03 2018
+++ pkgsrc/lang/go/version.mk   Tue Jan 30 17:05:21 2018
@@ -1,4 +1,6 @@
-# $NetBSD: version.mk,v 1.32 2018/01/28 11:31:03 bsiegert Exp $
+# $NetBSD: version.mk,v 1.33 2018/01/30 17:05:21 jperkin Exp $
+
+SSP_SUPPORTED= no
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/lang/go14/Makefile
diff -u pkgsrc/lang/go14/Makefile:1.15 pkgsrc/lang/go14/Makefile:1.16
--- pkgsrc/lang/go14/Makefile:1.15      Sat Jan 20 16:55:25 2018
+++ pkgsrc/lang/go14/Makefile   Tue Jan 30 17:05:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/01/20 16:55:25 christos Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/30 17:05:22 jperkin Exp $
 
 .include "../../lang/go/version.mk"
 
@@ -70,8 +70,6 @@ REPLACE_PERL+=        test/errchk
 # uses its own linker which does not support relro in 1.4.x
 CHECK_RELRO_SKIP=      go14/bin/go
 CHECK_RELRO_SKIP+=     go14/bin/gofmt
-# also does not support SSP at this time
-CHECK_SSP_SKIP=                ${CHECK_RELRO_SKIP}
 
 # uses /bin/rc (for Plan 9)
 CHECK_INTERPRETER_SKIP+=       go14/include/plan9/mklibc.rc