diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2017-12-31 15:59:24 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2017-12-31 15:59:24 +0000 |
| commit | 1c872d670cfef3acf11a7e43eb21c7c8115fe9e8 (patch) | |
| tree | b6ee80510a6749982294990a7e55f659e2d9456b /net | |
| parent | e054af38113eaceff59f92ca26eec84f65f2f3a4 (diff) | |
| download | pkgsrc-1c872d670cfef3acf11a7e43eb21c7c8115fe9e8.tar.gz | |
Fix build on Linux.
Linux has h2i but not the (BSD-specific) route package. Instead of having
a PLIST var named notsunos, create two separate ones for h2i and route.
Diffstat (limited to 'net')
| -rw-r--r-- | net/go-net/Makefile | 12 | ||||
| -rw-r--r-- | net/go-net/PLIST | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net/go-net/Makefile b/net/go-net/Makefile index 6a20215065c..291c232bac0 100644 --- a/net/go-net/Makefile +++ b/net/go-net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2017/07/22 19:32:41 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2017/12/31 15:59:24 bsiegert Exp $ DISTNAME= go-net-20170308 PKGREVISION= 1 @@ -19,12 +19,16 @@ CHECK_RELRO_SKIP+= bin/h2i .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= notsunos +PLIST_VARS+= h2i route -.if ${OPSYS} != "SunOS" +.if ${OPSYS} == "SunOS" # route support is not yet implemented for sunos # h2i is missing terminal.MakeRaw and terminal.Restore -PLIST.notsunos= yes +.elif ${OPSYS} == "Linux" +PLIST.h2i= yes +.else +PLIST.h2i= yes +PLIST.route= yes .endif .include "../../textproc/go-text/buildlink3.mk" diff --git a/net/go-net/PLIST b/net/go-net/PLIST index 56520fd3ef5..7b3203343aa 100644 --- a/net/go-net/PLIST +++ b/net/go-net/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2017/03/16 19:14:19 bsiegert Exp $ -${PLIST.notsunos}bin/h2i +@comment $NetBSD: PLIST,v 1.6 2017/12/31 15:59:24 bsiegert Exp $ +${PLIST.h2i}bin/h2i gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/bpf.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context/ctxhttp.a @@ -23,7 +23,7 @@ gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/nettest.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/netutil.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/proxy.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/publicsuffix.a -${PLIST.notsunos}gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/route.a +${PLIST.route}gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/route.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/trace.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav.a gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav/internal/xml.a |