diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2014-05-24 09:44:39 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2014-05-24 09:44:39 +0000 |
| commit | 41266b46a5d62ba7e5e33e551c5709bcab3b5420 (patch) | |
| tree | 4254a2e9d8a9ebd9ffdd62800382394dc7003054 /lang/go | |
| parent | 219535fbf94c160786f597a0dd6ec12e7844b4be (diff) | |
| download | pkgsrc-41266b46a5d62ba7e5e33e551c5709bcab3b5420.tar.gz | |
Apply patch from PR pkg/48834: introduce a GO_COMPILER variable that
contains the "arch character" (5, 6 or 8) and substitute it in PLIST.
Fixes installation on i386 and possibly evbarm.
Diffstat (limited to 'lang/go')
| -rw-r--r-- | lang/go/Makefile | 8 | ||||
| -rw-r--r-- | lang/go/PLIST | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lang/go/Makefile b/lang/go/Makefile index 5ec22c97657..329301da1a0 100644 --- a/lang/go/Makefile +++ b/lang/go/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2014/05/16 11:53:10 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/05/24 09:44:39 bsiegert Exp $ VERSION= 1.2.1 -PKGREVISION= 1 +PKGREVISION= 2 DISTNAME= go${VERSION}.src PKGNAME= go-${VERSION} CATEGORIES= lang @@ -25,12 +25,16 @@ BUILD_DEPENDS+= bash>=4.2nb3:../../shells/bash ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-evbarm .if ${MACHINE_ARCH} == "i386" GOARCH= 386 +GO_COMPILER= 8 .elif ${MACHINE_ARCH} == "x86_64" GOARCH= amd64 +GO_COMPILER= 6 .elif ${MACHINE_ARCH} == "evbarm" GOARCH= arm +GO_COMPILER= 5 .endif PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q} +PLIST_SUBST+= GO_COMPILER=${GO_COMPILER:Q} # cgo compiles under TMPDIR TMPDIR?= /tmp diff --git a/lang/go/PLIST b/lang/go/PLIST index ce066fd1654..4a61afbff0d 100644 --- a/lang/go/PLIST +++ b/lang/go/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2014/03/03 15:41:12 bsiegert Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/05/24 09:44:39 bsiegert Exp $ bin/go bin/gofmt go/AUTHORS @@ -502,10 +502,10 @@ go/pkg/obj/${GO_PLATFORM}/libbio.a go/pkg/obj/${GO_PLATFORM}/libcc.a go/pkg/obj/${GO_PLATFORM}/libgc.a go/pkg/obj/${GO_PLATFORM}/libmach.a -go/pkg/tool/${GO_PLATFORM}/6a -go/pkg/tool/${GO_PLATFORM}/6c -go/pkg/tool/${GO_PLATFORM}/6g -go/pkg/tool/${GO_PLATFORM}/6l +go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}a +go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}c +go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}g +go/pkg/tool/${GO_PLATFORM}/${GO_COMPILER}l go/pkg/tool/${GO_PLATFORM}/addr2line go/pkg/tool/${GO_PLATFORM}/cgo go/pkg/tool/${GO_PLATFORM}/dist @@ -606,7 +606,7 @@ go/src/cmd/6l/6.out.h go/src/cmd/6l/Makefile go/src/cmd/6l/asm.c go/src/cmd/6l/doc.go -go/src/cmd/6l/enam.c +go/src/cmd/${GO_COMPILER}l/enam.c go/src/cmd/6l/l.h go/src/cmd/6l/list.c go/src/cmd/6l/mkenam |