CVS commit: pkgsrc/devel/go-tools

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 23 10:47:46 UTC 2022

Modified Files:
        pkgsrc/devel/go-tools: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/go-tools/Makefile

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

Modified files:

Index: pkgsrc/devel/go-tools/Makefile
diff -u pkgsrc/devel/go-tools/Makefile:1.68 pkgsrc/devel/go-tools/Makefile:1.69
--- pkgsrc/devel/go-tools/Makefile:1.68 Wed Sep 21 00:06:34 2022
+++ pkgsrc/devel/go-tools/Makefile      Fri Sep 23 10:47:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2022/09/21 00:06:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.69 2022/09/23 10:47:46 wiz Exp $
 
 DISTNAME=              tools-0.1.0
 PKGNAME=               go-${DISTNAME}
@@ -70,6 +70,15 @@ CHECK_RELRO_SKIP+=   bin/stress
 CHECK_RELRO_SKIP+=     bin/stringer
 CHECK_RELRO_SKIP+=     bin/toolstash
 
+pre-patch:
+       ${RM} -rf ${WRKSRC}/cmd/getgo/server
+
+.include "go-modules.mk"
+
+.include "../../lang/go/go-module.mk"
+
+# XXX: breaks PIE if included before go-module.mk
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 PLIST_VARS+=           splitdwarf
@@ -77,10 +86,4 @@ PLIST_VARS+=         splitdwarf
 PLIST.splitdwarf=      yes
 .endif
 
-pre-patch:
-       ${RM} -rf ${WRKSRC}/cmd/getgo/server
-
-.include "go-modules.mk"
-
-.include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"