pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/go-tools go-tools: move splitdarf OPSYS handling...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/88a774556bf8
branches:  trunk
changeset: 385661:88a774556bf8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 23 10:47:46 2022 +0000

description:
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.

diffstat:

 devel/go-tools/Makefile |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r d7b9e7da7da6 -r 88a774556bf8 devel/go-tools/Makefile
--- a/devel/go-tools/Makefile   Fri Sep 23 10:31:50 2022 +0000
+++ b/devel/go-tools/Makefile   Fri Sep 23 10:47:46 2022 +0000
@@ -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/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.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"



Home | Main Index | Thread Index | Old Index