rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove wip/go115 after import to lang/go115

This commit is contained in:
Benny Siegert 2020-08-21 19:52:05 +00:00
parent 73ec222842
commit 20b8e28ecb
15 changed files with 0 additions and 9927 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -1219,7 +1219,6 @@ SUBDIR+= go-rateio
SUBDIR+= go-rest
SUBDIR+= go-trie
SUBDIR+= go-upspin
SUBDIR+= go115
SUBDIR+= goattracker
SUBDIR+= godura
SUBDIR+= goldendict

2
go115/ALTERNATIVES
View File

@ -1,2 +0,0 @@
bin/go @PREFIX@/go115/bin/go
bin/gofmt @PREFIX@/go115/bin/gofmt

10
go115/DESCR
View File

@ -1,10 +0,0 @@
The Go programming language is an open source project to make
programmers more productive.
Go is expressive, concise, clean, and efficient. Its concurrency
mechanisms make it easy to write programs that get the most out of
multicore and networked machines, while its novel type system enables
flexible and modular program construction. Go compiles quickly to
machine code yet has the convenience of garbage collection and the power
of run-time reflection. It's a fast, statically typed, compiled language
that feels like a dynamically typed, interpreted language.

109
go115/Makefile
View File

@ -1,109 +0,0 @@
# $NetBSD: Makefile,v 1.3 2020/05/08 00:49:59 maya Exp $
.include "../../lang/go/version.mk"
.include "../../lang/go/bootstrap.mk"
GO115_VERSION= 1.15 # needs to be in go/version.mk
DISTNAME= go${GO115_VERSION}.src
PKGNAME= go115-${GO115_VERSION}
CATEGORIES= lang
MASTER_SITES= https://storage.googleapis.com/golang/
EXTRACT_USING= gtar
MAINTAINER= bsiegert@NetBSD.org
HOMEPAGE= https://golang.org/
COMMENT= The Go programming language
LICENSE= modified-bsd
GOVERSSUFFIX= 115
WRKSRC= ${WRKDIR}/go
USE_TOOLS+= bash:run perl:run pax
# cgo compiles under TMPDIR
TMPDIR?= /tmp
BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
GOROOT_FINAL= ${PREFIX}/go${GOVERSSUFFIX}
INSTALLATION_DIRS= bin go${GOVERSSUFFIX}
REPLACE_BASH+= lib/time/update.bash
REPLACE_BASH+= misc/arm/a
REPLACE_BASH+= misc/cgo/fortran/test.bash
REPLACE_BASH+= misc/wasm/go_js_wasm_exec
REPLACE_BASH+= src/all.bash
REPLACE_BASH+= src/bootstrap.bash
REPLACE_BASH+= src/buildall.bash
REPLACE_BASH+= src/clean.bash
REPLACE_BASH+= src/cmd/compile/internal/ssa/gen/cover.bash
REPLACE_BASH+= src/cmd/go/mkalldocs.sh
REPLACE_BASH+= src/cmd/vendor/golang.org/x/sys/unix/mkall.sh
REPLACE_BASH+= src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh
REPLACE_BASH+= src/internal/trace/mkcanned.bash
REPLACE_BASH+= src/iostest.bash
REPLACE_BASH+= src/make.bash
REPLACE_BASH+= src/race.bash
REPLACE_BASH+= src/run.bash
REPLACE_BASH+= src/syscall/mkall.sh
REPLACE_BASH+= src/syscall/mkerrors.sh
REPLACE_BASH+= src/syscall/mksysnum_plan9.sh
REPLACE_PERL+= src/net/http/cgi/testdata/test.cgi
REPLACE_PERL+= src/regexp/syntax/make_perl_groups.pl
REPLACE_PERL+= src/syscall/*.pl
# uses own linker, which does not support relro on NetBSD
CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/bin/go
CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/bin/gofmt
CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/asm
CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/compile
CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/link
CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/cgo
# also does not support SSP at this time
CHECK_SSP_SKIP= ${CHECK_RELRO_SKIP}
# uses /bin/rc (for Plan 9)
CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/include/plan9/mklibc.rc
CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/all.rc
CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/clean.rc
CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/make.rc
CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/run.rc
PLIST_SUBST+= GOVERSSUFFIX=${GOVERSSUFFIX}
PLIST_VARS+= pty route
.if ${OPSYS} != "SunOS"
PLIST.pty= yes
.endif
.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
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} \
GOCACHE=${WRKDIR}/.cache/go-build \
${BASH} ./make.bash
# for RELRO build:
# cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash
do-install:
cd ${WRKSRC} && rm -rf pkg/obj pkg/bootstrap
cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX}
find ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX} -name \*.orig -exec rm {} \;
.for cmd in go gofmt
${LN} -sf ${PREFIX}/go${GOVERSSUFFIX}/bin/${cmd} ${DESTDIR}${PREFIX}/bin/${cmd}${GOVERSSUFFIX}
.endfor
do-test:
cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${GOOPT} ${BASH} run.bash --no-rebuild --banner ""
.include "../../mk/bsd.pkg.mk"

9559
go115/PLIST
View File

File diff suppressed because it is too large Load Diff

2
go115/PLIST.SunOS
View File

@ -1,2 +0,0 @@
@comment $NetBSD: PLIST.SunOS,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
go115/pkg/${GO_PLATFORM}/vendor/golang.org/x/net/lif.a

14
go115/distinfo
View File

@ -1,14 +0,0 @@
$NetBSD: distinfo,v 1.7 2020/06/17 09:37:25 bsiegert Exp $
SHA1 (go1.15.src.tar.gz) = a08d95390ed83cc24da48c2672124e4deb864b3f
RMD160 (go1.15.src.tar.gz) = c3854e2d4912723cf761d648e1380290c4ba8b60
SHA512 (go1.15.src.tar.gz) = 7d85382bcc6a0625dfa3d07196ab364860846367ed67697a7b1516b0af551a72bc4873882141fc3c7a60d39f2e27b33f6693e8b18b608de76fc9a55b5eac55ea
Size (go1.15.src.tar.gz) = 23002901 bytes
SHA1 (patch-misc_io_clangwrap.sh) = df5911c430ff6251abab12e5cc233e32fc3cd953
SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 3dfcb5c824d4201fadda0cfb6b48e5938899baf0
SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d
SHA1 (patch-src_runtime_cgo_gcc__netbsd__arm64.c) = d2fc1cebc104ad2e35f488e5edebcecd6f0323be
SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577
SHA1 (patch-src_runtime_sys__netbsd__arm64.s) = c8d3dfddd7930794a6ff9b2919c42632aa9358cd
SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b

13
go115/patches/patch-misc_io_clangwrap.sh
View File

@ -1,13 +0,0 @@
$NetBSD: patch-misc_io_clangwrap.sh,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
--- misc/ios/clangwrap.sh.orig 2020-07-24 17:06:50.000000000 +0000
+++ misc/ios/clangwrap.sh
@@ -8,7 +8,7 @@ export IPHONEOS_DEPLOYMENT_TARGET=5.1
# cmd/cgo doesn't support llvm-gcc-4.2, so we have to use clang.
CLANG=`xcrun --sdk $SDK --find clang`
-if [ "$GOARCH" == "arm64" ]; then
+if [ "$GOARCH" = "arm64" ]; then
CLANGARCH="arm64"
else
echo "unknown GOARCH=$GOARCH" >&2

16
go115/patches/patch-src_cmd_dist_util.go
View File

@ -1,16 +0,0 @@
$NetBSD: patch-src_cmd_dist_util.go,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
--- src/cmd/dist/util.go.orig 2017-02-16 19:12:22.000000000 +0000
+++ src/cmd/dist/util.go
@@ -531,6 +531,11 @@ func xgetgoarm() string {
// sense to auto-detect the setting.
return "7"
}
+ if goos == "netbsd" {
+ // NetBSD go/arm support only earmv6hf or earmv7hf now.
+ // Any armv5 (or before) devices cannot work.
+ return "6"
+ }
if gohostarch != "arm" || goos != gohostos {
// Conservative default for cross-compilation.
return "5"

104
go115/patches/patch-src_cmd_link_internal_ld_elf.go
View File

@ -1,104 +0,0 @@
$NetBSD: patch-src_cmd_link_internal_ld_elf.go,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
--- src/cmd/link/internal/ld/elf.go.orig 2020-07-24 17:06:50.000000000 +0000
+++ src/cmd/link/internal/ld/elf.go
@@ -854,10 +854,12 @@ func elfwritenotehdr(out *OutBuf, str st
// NetBSD Signature (as per sys/exec_elf.h)
const (
- ELF_NOTE_NETBSD_NAMESZ = 7
- ELF_NOTE_NETBSD_DESCSZ = 4
- ELF_NOTE_NETBSD_TAG = 1
- ELF_NOTE_NETBSD_VERSION = 700000000 /* NetBSD 7.0 */
+ ELF_NOTE_NETBSD_NAMESZ = 7
+ ELF_NOTE_NETBSD_DESCSZ = 4
+ ELF_NOTE_NETBSD_TAG = 1
+ ELF_NOTE_NETBSD_VERSION = 700000000 /* NetBSD 7.0 */
+ ELF_NOTE_NETBSD_MARCH_NAMESZ = 7
+ ELF_NOTE_NETBSD_MARCH_TAG = 5
)
var ELF_NOTE_NETBSD_NAME = []byte("NetBSD\x00")
@@ -867,6 +869,23 @@ func elfnetbsdsig(sh *ElfShdr, startva u
return elfnote(sh, startva, resoff, n)
}
+func elfnetbsdarmarch() []byte {
+ switch objabi.GOARM {
+ case 6:
+ return []byte("earmv6hf\x00")
+ case 7:
+ return []byte("earmv7hf\x00")
+ default:
+ return []byte("earm\x00")
+ }
+}
+
+func elfnetbsdarmsig(sh *ElfShdr, startva uint64, resoff uint64) int {
+ descsz := len(elfnetbsdarmarch())
+ n := int(Rnd(ELF_NOTE_NETBSD_MARCH_NAMESZ, 4) + Rnd(int64(descsz), 4))
+ return elfnote(sh, startva, resoff, n)
+}
+
func elfwritenetbsdsig(out *OutBuf) int {
// Write Elf_Note header.
sh := elfwritenotehdr(out, ".note.netbsd.ident", ELF_NOTE_NETBSD_NAMESZ, ELF_NOTE_NETBSD_DESCSZ, ELF_NOTE_NETBSD_TAG)
@@ -902,6 +921,22 @@ func elfwritenetbsdpax(out *OutBuf) int
return int(sh.size)
}
+func elfwritenetbsdarmsig(out *OutBuf) int {
+ mArch := elfnetbsdarmarch()
+ descsz := len(mArch)
+ sh := elfwritenotehdr(out, ".note.netbsd.march",
+ ELF_NOTE_NETBSD_MARCH_NAMESZ, uint32(descsz),
+ ELF_NOTE_NETBSD_MARCH_TAG)
+ if sh == nil {
+ return 0
+ }
+ out.Write(ELF_NOTE_NETBSD_NAME)
+ out.Write8(0)
+ out.Write(mArch)
+
+ return int(sh.size)
+}
+
// OpenBSD Signature
const (
ELF_NOTE_OPENBSD_NAMESZ = 8
@@ -1519,6 +1554,9 @@ func (ctxt *Link) doelf() {
if *flagRace {
shstrtab.Addstring(".note.netbsd.pax")
}
+ if ctxt.Arch.Family == sys.ARM {
+ shstrtab.Addstring(".note.netbsd.march")
+ }
}
if ctxt.IsOpenbsd() {
shstrtab.Addstring(".note.openbsd.ident")
@@ -1979,6 +2017,15 @@ func Asmbelf(ctxt *Link, symo int64) {
pnote.flags = PF_R
phsh(pnote, sh)
}
+ if ctxt.HeadType == objabi.Hnetbsd && ctxt.Arch.Family == sys.ARM {
+ var sh *ElfShdr
+ sh = elfshname(".note.netbsd.march")
+ resoff -= int64(elfnetbsdarmsig(sh, uint64(startva), uint64(resoff)))
+ pnote = newElfPhdr()
+ pnote.type_ = PT_NOTE
+ pnote.flags = PF_R
+ phsh(pnote, sh)
+ }
if len(buildinfo) > 0 {
sh := elfshname(".note.gnu.build-id")
@@ -2329,6 +2376,9 @@ elfobj:
if ctxt.LinkMode != LinkExternal {
if ctxt.HeadType == objabi.Hnetbsd {
a += int64(elfwritenetbsdsig(ctxt.Out))
+ if ctxt.Arch.Family == sys.ARM {
+ a += int64(elfwritenetbsdarmsig(ctxt.Out))
+ }
}
if ctxt.HeadType == objabi.Hopenbsd {
a += int64(elfwriteopenbsdsig(ctxt.Out))

10
go115/patches/patch-src_crypto_x509_root__bsd.go
View File

@ -1,10 +0,0 @@
$NetBSD: patch-src_crypto_x509_root__bsd.go,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
--- src/crypto/x509/root_bsd.go.orig 2017-07-24 19:38:15.000000000 +0000
+++ src/crypto/x509/root_bsd.go
@@ -12,4 +12,5 @@ var certFiles = []string{
"/etc/ssl/cert.pem", // OpenBSD
"/usr/local/share/certs/ca-root-nss.crt", // DragonFly
"/etc/openssl/certs/ca-certificates.crt", // NetBSD
+ "/etc/ssl/certs/ca-certificates.crt", // NetBSD
}

15
go115/patches/patch-src_runtime_cgo_gcc__netbsd__arm64.c
View File

@ -1,15 +0,0 @@
$NetBSD: patch-src_runtime_cgo_gcc__netbsd__arm64.c,v 1.1 2020/05/01 15:58:00 tnn Exp $
provide declaration of crosscall1
--- src/runtime/cgo/gcc_netbsd_arm64.c.orig 2020-04-08 19:15:51.000000000 +0000
+++ src/runtime/cgo/gcc_netbsd_arm64.c
@@ -53,6 +53,8 @@ _cgo_sys_thread_start(ThreadStart *ts)
}
}
+extern void crosscall1(void (*fn)(void), void (*setg_gcc)(void*), void *g);
+
static void*
threadentry(void *v)
{

21
go115/patches/patch-src_runtime_os__netbsd.go
View File

@ -1,21 +0,0 @@
$NetBSD: patch-src_runtime_os__netbsd.go,v 1.1 2020/02/27 14:32:57 bsiegert Exp $
--- src/runtime/os_netbsd.go.orig 2017-02-16 19:12:24.000000000 +0000
+++ src/runtime/os_netbsd.go
@@ -79,13 +79,13 @@ var sigset_all = sigset{[4]uint32{^uint3
// From NetBSD's <sys/sysctl.h>
const (
- _CTL_HW = 6
- _HW_NCPU = 3
+ _CTL_HW = 6
+ _HW_NCPUONLINE = 16
_HW_PAGESIZE = 7
)
func getncpu() int32 {
- mib := [2]uint32{_CTL_HW, _HW_NCPU}
+ mib := [2]uint32{_CTL_HW, _HW_NCPUONLINE}
out := uint32(0)
nout := unsafe.Sizeof(out)
ret := sysctl(&mib[0], 2, (*byte)(unsafe.Pointer(&out)), &nout, nil, 0)

37
go115/patches/patch-src_runtime_sys__netbsd__arm64.s
View File

@ -1,37 +0,0 @@
$NetBSD: patch-src_runtime_sys__netbsd__arm64.s,v 1.2 2020/04/27 18:42:12 tnn Exp $
fix stack alignent for runtime.pipe2 return value
Work around kernel clobbering of r28 on aarch64 by reloading from ucontext.
https://nxr.netbsd.org/xref/src/sys/arch/aarch64/aarch64/sig_machdep.c#104
--- src/runtime/sys_netbsd_arm64.s.orig 2020-04-08 19:15:51.000000000 +0000
+++ src/runtime/sys_netbsd_arm64.s
@@ -169,11 +169,12 @@ pipeok:
// func pipe2(flags int32) (r, w int32, errno int32)
TEXT runtime·pipe2(SB),NOSPLIT|NOFRAME,$0-20
- ADD $8, RSP, R0
+ ADD $16, RSP, R0
MOVW flags+0(FP), R1
SVC $SYS_pipe2
- BCC 2(PC)
+ BCC pipe2ok
NEG R0, R0
+pipe2ok:
MOVW R0, errno+16(FP)
RET
@@ -319,6 +320,12 @@ TEXT runtime·sigtramp(SB),NOSPLIT,$192
MOVD R26, 8*11(RSP)
MOVD R27, 8*12(RSP)
MOVD g, 8*13(RSP)
+ // Unclobber g for now (kernel uses it as ucontext ptr)
+ // See https://github.com/golang/go/issues/30824#issuecomment-492772426
+ // This is only correct in the non-cgo case.
+ // XXX should use lwp_getprivate as suggested.
+ // 8*36 is ucontext.uc_mcontext.__gregs[_REG_X28]
+ MOVD 8*36(g), g
MOVD R29, 8*14(RSP)
FMOVD F8, 8*15(RSP)
FMOVD F9, 8*16(RSP)

14
go115/patches/patch-src_syscall_zsysnum__solaris__amd64.go
View File

@ -1,14 +0,0 @@
$NetBSD: patch-src_syscall_zsysnum__solaris__amd64.go,v 1.1 2020/02/27 14:32:57 bsiegert 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
)