From b5f3f0eeb0aabb1320c5d3038bafae36e3149bc3 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 31 Aug 2016 14:15:33 +0000 Subject: Fix install on Linux and SunOS. --- lang/go/Makefile | 10 +++++++++- lang/go/PLIST | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lang/go/Makefile b/lang/go/Makefile index 38eec196839..476ca36b48b 100644 --- a/lang/go/Makefile +++ b/lang/go/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/08/20 06:22:38 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2016/08/31 14:15:33 jperkin Exp $ .include "version.mk" @@ -72,6 +72,14 @@ CHECK_INTERPRETER_SKIP+= go/src/run.rc BUILD_DEPENDS+= go14-1.4*:../../lang/go14 GOROOT_BOOTSTRAP= ${PREFIX}/go14 +.include "../../mk/bsd.prefs.mk" + +PLIST_VARS+= route + +.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS" +PLIST.route= yes +.endif + pre-build: cd ${WRKSRC}/src/syscall && \ env GOOS=${LOWER_OPSYS:Q} GOARCH=${GOARCH:Q} \ diff --git a/lang/go/PLIST b/lang/go/PLIST index d2c76af3739..b812ba4eadf 100644 --- a/lang/go/PLIST +++ b/lang/go/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2016/08/19 09:38:06 bsiegert Exp $ +@comment $NetBSD: PLIST,v 1.26 2016/08/31 14:15:33 jperkin Exp $ bin/go bin/gofmt go/AUTHORS @@ -1038,7 +1038,7 @@ go/pkg/${GO_PLATFORM}/unicode/utf16.a go/pkg/${GO_PLATFORM}/unicode/utf8.a go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/http2/hpack.a go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/lex/httplex.a -go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/route.a +${PLIST.route}go/pkg/${GO_PLATFORM}/vendor/golang_org/x/net/route.a go/pkg/tool/${GO_PLATFORM}/addr2line go/pkg/tool/${GO_PLATFORM}/api go/pkg/tool/${GO_PLATFORM}/asm -- cgit v1.2.3