summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2019-03-13 10:40:19 +0000
committerbsiegert <bsiegert@pkgsrc.org>2019-03-13 10:40:19 +0000
commitbd62f303f48214a21da2d10de605232e91151f79 (patch)
tree2a1ea66f1d0660f829338debdac7bed9a34b5795 /lang
parent0b109c638b4e4728370ca8ebcd0a25ba26e7309f (diff)
downloadpkgsrc-bd62f303f48214a21da2d10de605232e91151f79.tar.gz
go112: paper over issues with filenames containing umlauts.
- extract using gtar (hopefully more lenient than bsdtar) - remove the files in question in post-extract While here, re-add a PLIST.route conditional that was accidentally removed, breaking the build on Linux (PR pkg/54054).
Diffstat (limited to 'lang')
-rw-r--r--lang/go112/Makefile8
-rw-r--r--lang/go112/PLIST7
2 files changed, 8 insertions, 7 deletions
diff --git a/lang/go112/Makefile b/lang/go112/Makefile
index 7e9666fee92..0b2703bbc60 100644
--- a/lang/go112/Makefile
+++ b/lang/go112/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2019/03/09 09:29:30 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/13 10:40:19 bsiegert Exp $
.include "../../lang/go/version.mk"
DISTNAME= go${GO112_VERSION}.src
PKGNAME= go112-${GO112_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= https://storage.googleapis.com/golang/
-EXTRACT_USING= bsdtar
+EXTRACT_USING= gtar
MAINTAINER= bsiegert@NetBSD.org
HOMEPAGE= http://golang.org/
@@ -100,6 +101,9 @@ PLIST.pty= yes
PLIST.route= yes
.endif
+post-extract:
+ ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
+
do-build:
cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${GOOPT} ${BASH} ./make.bash
# for RELRO build:
diff --git a/lang/go112/PLIST b/lang/go112/PLIST
index 7fc412b68dd..10d6c30529b 100644
--- a/lang/go112/PLIST
+++ b/lang/go112/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/09 09:29:30 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/03/13 10:40:19 bsiegert Exp $
bin/go${GOVERSSUFFIX}
bin/gofmt${GOVERSSUFFIX}
go112/AUTHORS
@@ -1510,7 +1510,7 @@ go112/pkg/${GO_PLATFORM}/internal/x/net/http2/hpack.a
go112/pkg/${GO_PLATFORM}/internal/x/net/idna.a
go112/pkg/${GO_PLATFORM}/internal/x/net/internal/nettest.a
go112/pkg/${GO_PLATFORM}/internal/x/net/nettest.a
-go112/pkg/${GO_PLATFORM}/internal/x/net/route.a
+${PLIST.route}go112/pkg/${GO_PLATFORM}/internal/x/net/route.a
go112/pkg/${GO_PLATFORM}/internal/x/text/secure.a
go112/pkg/${GO_PLATFORM}/internal/x/text/secure/bidirule.a
go112/pkg/${GO_PLATFORM}/internal/x/text/transform.a
@@ -8918,9 +8918,6 @@ go112/test/fixedbugs/issue27695b.go
go112/test/fixedbugs/issue27695c.go
go112/test/fixedbugs/issue27718.go
go112/test/fixedbugs/issue27829.go
-go112/test/fixedbugs/issue27836.dir/Äfoo.go
-go112/test/fixedbugs/issue27836.dir/Ämain.go
-go112/test/fixedbugs/issue27836.go
go112/test/fixedbugs/issue27938.go
go112/test/fixedbugs/issue27961.go
go112/test/fixedbugs/issue28055.go