Fri Sep 14 09:24:30 2018 UTC ()
lang/go: Add SYS_IOCTL on SunOS. Bump PKGREVISION.


(fhajny)
diff -r1.66 -r1.67 pkgsrc/lang/go/Makefile
diff -r1.62 -r1.63 pkgsrc/lang/go/distinfo
diff -r0 -r1.1 pkgsrc/lang/go/patches/patch-src_syscall_zsysnum__solaris__amd64.go
cvs diff -r1.66 -r1.67 pkgsrc/lang/go/Makefile (switch to unified diff)

--- pkgsrc/lang/go/Makefile 2018/08/27 15:01:09 1.66
+++ pkgsrc/lang/go/Makefile 2018/09/14 09:24:30 1.67
@@ -1,109 +1,110 @@ @@ -1,109 +1,110 @@
1# $NetBSD: Makefile,v 1.66 2018/08/27 15:01:09 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.67 2018/09/14 09:24:30 fhajny Exp $
2 2
3.include "version.mk" 3.include "version.mk"
4 4
5DISTNAME= go${GO_VERSION}.src 5DISTNAME= go${GO_VERSION}.src
6PKGNAME= go-${GO_VERSION} 6PKGNAME= go-${GO_VERSION}
 7PKGREVISION= 1
7CATEGORIES= lang 8CATEGORIES= lang
8MASTER_SITES= https://storage.googleapis.com/golang/ 9MASTER_SITES= https://storage.googleapis.com/golang/
9EXTRACT_USING= bsdtar 10EXTRACT_USING= bsdtar
10 11
11MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
12HOMEPAGE= http://golang.org/ 13HOMEPAGE= http://golang.org/
13COMMENT= The Go programming language 14COMMENT= The Go programming language
14LICENSE= modified-bsd 15LICENSE= modified-bsd
15 16
16WRKSRC= ${WRKDIR}/go 17WRKSRC= ${WRKDIR}/go
17USE_TOOLS+= bash:run perl:run pax 18USE_TOOLS+= bash:run perl:run pax
18 19
19# uses ulimit -T 20# uses ulimit -T
20# BUILD_DEPENDS+= bash>=4.2nb3:../../shells/bash 21# BUILD_DEPENDS+= bash>=4.2nb3:../../shells/bash
21 22
22# cgo compiles under TMPDIR 23# cgo compiles under TMPDIR
23TMPDIR?= /tmp 24TMPDIR?= /tmp
24BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR} 25BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
25 26
26GOROOT_FINAL= ${PREFIX}/go 27GOROOT_FINAL= ${PREFIX}/go
27INSTALLATION_DIRS= bin 28INSTALLATION_DIRS= bin
28 29
29REPLACE_BASH+= doc/articles/wiki/test.bash 30REPLACE_BASH+= doc/articles/wiki/test.bash
30REPLACE_BASH+= doc/codewalk/run 31REPLACE_BASH+= doc/codewalk/run
31REPLACE_BASH+= lib/time/update.bash 32REPLACE_BASH+= lib/time/update.bash
32REPLACE_BASH+= misc/arm/a 33REPLACE_BASH+= misc/arm/a
33REPLACE_BASH+= misc/benchcmp 34REPLACE_BASH+= misc/benchcmp
34REPLACE_BASH+= misc/cgo/fortran/test.bash 35REPLACE_BASH+= misc/cgo/fortran/test.bash
35REPLACE_BASH+= misc/cgo/testgodefs/test.bash 36REPLACE_BASH+= misc/cgo/testgodefs/test.bash
36REPLACE_BASH+= misc/cgo/testplugin/test.bash 37REPLACE_BASH+= misc/cgo/testplugin/test.bash
37REPLACE_BASH+= misc/nacl/go_nacl_386_exec 38REPLACE_BASH+= misc/nacl/go_nacl_386_exec
38REPLACE_BASH+= misc/nacl/go_nacl_amd64p32_exec 39REPLACE_BASH+= misc/nacl/go_nacl_amd64p32_exec
39REPLACE_BASH+= misc/nacl/go_nacl_arm_exec 40REPLACE_BASH+= misc/nacl/go_nacl_arm_exec
40REPLACE_BASH+= src/all.bash 41REPLACE_BASH+= src/all.bash
41REPLACE_BASH+= src/androidtest.bash 42REPLACE_BASH+= src/androidtest.bash
42REPLACE_BASH+= src/bootstrap.bash 43REPLACE_BASH+= src/bootstrap.bash
43REPLACE_BASH+= src/buildall.bash 44REPLACE_BASH+= src/buildall.bash
44REPLACE_BASH+= src/clean.bash 45REPLACE_BASH+= src/clean.bash
45REPLACE_BASH+= src/cmd/go/mkalldocs.sh 46REPLACE_BASH+= src/cmd/go/mkalldocs.sh
46REPLACE_BASH+= src/cmd/vendor/github.com/google/pprof/test.sh 47REPLACE_BASH+= src/cmd/vendor/github.com/google/pprof/test.sh
47REPLACE_BASH+= src/internal/trace/mkcanned.bash 48REPLACE_BASH+= src/internal/trace/mkcanned.bash
48REPLACE_BASH+= src/iostest.bash 49REPLACE_BASH+= src/iostest.bash
49REPLACE_BASH+= src/make.bash 50REPLACE_BASH+= src/make.bash
50REPLACE_BASH+= src/naclmake.bash 51REPLACE_BASH+= src/naclmake.bash
51REPLACE_BASH+= src/nacltest.bash 52REPLACE_BASH+= src/nacltest.bash
52REPLACE_BASH+= src/race.bash 53REPLACE_BASH+= src/race.bash
53REPLACE_BASH+= src/run.bash 54REPLACE_BASH+= src/run.bash
54REPLACE_BASH+= src/runtime/mknacl.sh 55REPLACE_BASH+= src/runtime/mknacl.sh
55REPLACE_BASH+= src/syscall/mkall.sh 56REPLACE_BASH+= src/syscall/mkall.sh
56REPLACE_BASH+= src/syscall/mkerrors.sh 57REPLACE_BASH+= src/syscall/mkerrors.sh
57REPLACE_BASH+= src/syscall/mksysnum_plan9.sh 58REPLACE_BASH+= src/syscall/mksysnum_plan9.sh
58 59
59REPLACE_PERL+= src/net/http/cgi/testdata/test.cgi 60REPLACE_PERL+= src/net/http/cgi/testdata/test.cgi
60REPLACE_PERL+= src/regexp/syntax/make_perl_groups.pl 61REPLACE_PERL+= src/regexp/syntax/make_perl_groups.pl
61REPLACE_PERL+= src/syscall/*.pl 62REPLACE_PERL+= src/syscall/*.pl
62REPLACE_PERL+= test/errchk 63REPLACE_PERL+= test/errchk
63 64
64# uses own linker, which does not support relro on NetBSD 65# uses own linker, which does not support relro on NetBSD
65CHECK_RELRO_SKIP+= go/bin/go 66CHECK_RELRO_SKIP+= go/bin/go
66CHECK_RELRO_SKIP+= go/bin/gofmt 67CHECK_RELRO_SKIP+= go/bin/gofmt
67CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/asm 68CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/asm
68CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/compile 69CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/compile
69CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/link 70CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/link
70CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/cgo 71CHECK_RELRO_SKIP+= go/pkg/bootstrap/bin/cgo
71# also does not support SSP at this time 72# also does not support SSP at this time
72CHECK_SSP_SKIP= ${CHECK_RELRO_SKIP} 73CHECK_SSP_SKIP= ${CHECK_RELRO_SKIP}
73 74
74# uses /bin/rc (for Plan 9) 75# uses /bin/rc (for Plan 9)
75CHECK_INTERPRETER_SKIP+= go/include/plan9/mklibc.rc 76CHECK_INTERPRETER_SKIP+= go/include/plan9/mklibc.rc
76CHECK_INTERPRETER_SKIP+= go/src/all.rc 77CHECK_INTERPRETER_SKIP+= go/src/all.rc
77CHECK_INTERPRETER_SKIP+= go/src/clean.rc 78CHECK_INTERPRETER_SKIP+= go/src/clean.rc
78CHECK_INTERPRETER_SKIP+= go/src/make.rc 79CHECK_INTERPRETER_SKIP+= go/src/make.rc
79CHECK_INTERPRETER_SKIP+= go/src/run.rc 80CHECK_INTERPRETER_SKIP+= go/src/run.rc
80 81
81BUILD_DEPENDS+= go14-1.4*:../../lang/go14 82BUILD_DEPENDS+= go14-1.4*:../../lang/go14
82GOROOT_BOOTSTRAP= ${PREFIX}/go14 83GOROOT_BOOTSTRAP= ${PREFIX}/go14
83 84
84.include "../../mk/bsd.prefs.mk" 85.include "../../mk/bsd.prefs.mk"
85 86
86PLIST_VARS+= pty route 87PLIST_VARS+= pty route
87 88
88.if ${OPSYS} != "SunOS" 89.if ${OPSYS} != "SunOS"
89PLIST.pty= yes 90PLIST.pty= yes
90.endif 91.endif
91 92
92.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS" 93.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
93PLIST.route= yes 94PLIST.route= yes
94.endif 95.endif
95 96
96do-build: 97do-build:
97 cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${GOOPT} ${BASH} ./make.bash 98 cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${GOOPT} ${BASH} ./make.bash
98# for RELRO build: 99# for RELRO build:
99# cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash 100# cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash
100 101
101do-install: 102do-install:
102 cd ${WRKSRC} && rm -rf .hgignore .hgtags pkg/obj 103 cd ${WRKSRC} && rm -rf .hgignore .hgtags pkg/obj
103 cd ${WRKDIR} && pax -rw go ${DESTDIR}${PREFIX} 104 cd ${WRKDIR} && pax -rw go ${DESTDIR}${PREFIX}
104 find ${DESTDIR}${PREFIX}/go -name \*.orig -exec rm {} \; 105 find ${DESTDIR}${PREFIX}/go -name \*.orig -exec rm {} \;
105 106
106do-test: 107do-test:
107 cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${GOOPT} ${BASH} run.bash --no-rebuild --banner "" 108 cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${GOOPT} ${BASH} run.bash --no-rebuild --banner ""
108 109
109.include "../../mk/bsd.pkg.mk" 110.include "../../mk/bsd.pkg.mk"
cvs diff -r1.62 -r1.63 pkgsrc/lang/go/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/go/Attic/distinfo 2018/08/27 15:01:09 1.62
+++ pkgsrc/lang/go/Attic/distinfo 2018/09/14 09:24:30 1.63
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.62 2018/08/27 15:01:09 bsiegert Exp $ 1$NetBSD: distinfo,v 1.63 2018/09/14 09:24:30 fhajny Exp $
2 2
3SHA1 (go1.10.4.src.tar.gz) = adcd9d0bbbc764fa4ff20c08eb4a5a527fa95d96 3SHA1 (go1.10.4.src.tar.gz) = adcd9d0bbbc764fa4ff20c08eb4a5a527fa95d96
4RMD160 (go1.10.4.src.tar.gz) = a42ae4d0b21e8ceb500ca10a590f16b0811c7a4e 4RMD160 (go1.10.4.src.tar.gz) = a42ae4d0b21e8ceb500ca10a590f16b0811c7a4e
5SHA512 (go1.10.4.src.tar.gz) = ead2c06d903670ff4530748aa2fa6a1140fdf32cf3b8d74cd7d6e046af73c79fd5f98d2188062e6845e5c0513c080ed7079a210720c30338cb8730b95aede9f5 5SHA512 (go1.10.4.src.tar.gz) = ead2c06d903670ff4530748aa2fa6a1140fdf32cf3b8d74cd7d6e046af73c79fd5f98d2188062e6845e5c0513c080ed7079a210720c30338cb8730b95aede9f5
6Size (go1.10.4.src.tar.gz) = 18331174 bytes 6Size (go1.10.4.src.tar.gz) = 18331174 bytes
7SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29 7SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
8SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e 8SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
9SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 7afd0da4734f201c8b885b743e83e5b70ddb0bf0 9SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 7afd0da4734f201c8b885b743e83e5b70ddb0bf0
10SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d 10SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d
11SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577 11SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577
 12SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b
File Added: pkgsrc/lang/go/patches/Attic/patch-src_syscall_zsysnum__solaris__amd64.go
$NetBSD: patch-src_syscall_zsysnum__solaris__amd64.go,v 1.1 2018/09/14 09:24:30 fhajny Exp $

SunOS does have SYS_ioctl.

--- src/syscall/zsysnum_solaris_amd64.go.orig	2018-08-24 19:33:36.000000000 +0000
+++ src/syscall/zsysnum_solaris_amd64.go
@@ -8,6 +8,7 @@ package syscall
 
 // TODO(aram): remove these before Go 1.3.
 const (
+	SYS_IOCTL  = 54
 	SYS_EXECVE = 59
 	SYS_FCNTL  = 62
 )