pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/go112 go112: paper over issues with filenames con...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/12c1879fd197
branches:  trunk
changeset: 331131:12c1879fd197
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Mar 13 10:40:19 2019 +0000

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

 lang/go112/Makefile |  8 ++++++--
 lang/go112/PLIST    |  7 ++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r b633d27cc8f1 -r 12c1879fd197 lang/go112/Makefile
--- a/lang/go112/Makefile       Wed Mar 13 08:57:20 2019 +0000
+++ b/lang/go112/Makefile       Wed Mar 13 10:40:19 2019 +0000
@@ -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@localhost
 HOMEPAGE=      http://golang.org/
@@ -100,6 +101,9 @@
 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 -r b633d27cc8f1 -r 12c1879fd197 lang/go112/PLIST
--- a/lang/go112/PLIST  Wed Mar 13 08:57:20 2019 +0000
+++ b/lang/go112/PLIST  Wed Mar 13 10:40:19 2019 +0000
@@ -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/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/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



Home | Main Index | Thread Index | Old Index