Fri Sep 23 10:47:46 2022 UTC ()
go-tools: move splitdarf OPSYS handling lower

In its original place it broke PIE handling.
XXX: This should be fixed in go-module.mk, but that can be done after
the freeze.


(wiz)
diff -r1.68 -r1.69 pkgsrc/devel/go-tools/Makefile
cvs diff -r1.68 -r1.69 pkgsrc/devel/go-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/go-tools/Makefile 2022/09/21 00:06:34 1.68
+++ pkgsrc/devel/go-tools/Makefile 2022/09/23 10:47:46 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.68 2022/09/21 00:06:34 schmonz Exp $ 1# $NetBSD: Makefile,v 1.69 2022/09/23 10:47:46 wiz Exp $
2 2
3DISTNAME= tools-0.1.0 3DISTNAME= tools-0.1.0
4PKGNAME= go-${DISTNAME} 4PKGNAME= go-${DISTNAME}
5PKGREVISION= 16 5PKGREVISION= 16
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
8GITHUB_PROJECT= tools 8GITHUB_PROJECT= tools
9GITHUB_TAG= v${PKGVERSION_NOREV} 9GITHUB_TAG= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= bsiegert@NetBSD.org 11MAINTAINER= bsiegert@NetBSD.org
12HOMEPAGE= https://golang.org/ 12HOMEPAGE= https://golang.org/
13COMMENT= Tools for use with Go, including godoc 13COMMENT= Tools for use with Go, including godoc
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -60,27 +60,30 @@ CHECK_RELRO_SKIP+= bin/gotype @@ -60,27 +60,30 @@ CHECK_RELRO_SKIP+= bin/gotype
60CHECK_RELRO_SKIP+= bin/goyacc 60CHECK_RELRO_SKIP+= bin/goyacc
61CHECK_RELRO_SKIP+= bin/guru 61CHECK_RELRO_SKIP+= bin/guru
62CHECK_RELRO_SKIP+= bin/html2article 62CHECK_RELRO_SKIP+= bin/html2article
63CHECK_RELRO_SKIP+= bin/netrcauth 63CHECK_RELRO_SKIP+= bin/netrcauth
64CHECK_RELRO_SKIP+= bin/present 64CHECK_RELRO_SKIP+= bin/present
65CHECK_RELRO_SKIP+= bin/present2md 65CHECK_RELRO_SKIP+= bin/present2md
66CHECK_RELRO_SKIP+= bin/server 66CHECK_RELRO_SKIP+= bin/server
67CHECK_RELRO_SKIP+= bin/splitdwarf 67CHECK_RELRO_SKIP+= bin/splitdwarf
68CHECK_RELRO_SKIP+= bin/ssadump 68CHECK_RELRO_SKIP+= bin/ssadump
69CHECK_RELRO_SKIP+= bin/stress 69CHECK_RELRO_SKIP+= bin/stress
70CHECK_RELRO_SKIP+= bin/stringer 70CHECK_RELRO_SKIP+= bin/stringer
71CHECK_RELRO_SKIP+= bin/toolstash 71CHECK_RELRO_SKIP+= bin/toolstash
72 72
 73pre-patch:
 74 ${RM} -rf ${WRKSRC}/cmd/getgo/server
 75
 76.include "go-modules.mk"
 77
 78.include "../../lang/go/go-module.mk"
 79
 80# XXX: breaks PIE if included before go-module.mk
 81
73.include "../../mk/bsd.fast.prefs.mk" 82.include "../../mk/bsd.fast.prefs.mk"
74 83
75PLIST_VARS+= splitdwarf 84PLIST_VARS+= splitdwarf
76.if ${OPSYS} != "SunOS" 85.if ${OPSYS} != "SunOS"
77PLIST.splitdwarf= yes 86PLIST.splitdwarf= yes
78.endif 87.endif
79 88
80pre-patch: 
81 ${RM} -rf ${WRKSRC}/cmd/getgo/server 
82 
83.include "go-modules.mk" 
84 
85.include "../../lang/go/go-module.mk" 
86.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"