Remove go114, now lang/go114.

This commit is contained in:
Benny Siegert 2020-02-27 17:37:24 +01:00
parent d31565e470
commit 0ecb689c81
15 changed files with 0 additions and 9543 deletions

View File

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

View File

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

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.

View File

@ -1,105 +0,0 @@
# $NetBSD: Makefile,v 1.1 2019/12/07 21:34:17 bsiegert Exp $
.include "../../lang/go/version.mk"
GO114_VERSION= 1.14
DISTNAME= go${GO114_VERSION}.src
PKGNAME= go114-${GO114_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= 114
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/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
BUILD_DEPENDS+= go14-1.4*:../../lang/go14
GOROOT_BOOTSTRAP= ${PREFIX}/go14
PLIST_SUBST+= GOVERSSUFFIX=${GOVERSSUFFIX}
.include "../../mk/bsd.prefs.mk"
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} ${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 .hgignore .hgtags 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"

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +0,0 @@
@comment $NetBSD: PLIST.Linux,v 1.1 2019/12/07 21:34:17 bsiegert Exp $
go114/pkg/${GO_PLATFORM}/internal/syscall/unix.a

View File

@ -1,2 +0,0 @@
@comment $NetBSD: PLIST.OpenBSD,v 1.1 2019/12/07 21:34:17 bsiegert Exp $
go114/pkg/${GO_PLATFORM}/internal/syscall/unix.a

View File

@ -1,2 +0,0 @@
@comment $NetBSD: PLIST.SunOS,v 1.2 2019/12/09 10:13:38 jperkin Exp $
go114/pkg/${GO_PLATFORM}/vendor/golang.org/x/net/lif.a

View File

@ -1,12 +0,0 @@
$NetBSD: distinfo,v 1.1 2019/12/07 21:34:17 bsiegert Exp $
SHA1 (go1.14.src.tar.gz) = b46ef8d3ede13a8e890cfab8a9f269190a0a8618
RMD160 (go1.14.src.tar.gz) = aab04262b0664a78ad77e06583c42a071c7fb331
SHA512 (go1.14.src.tar.gz) = b04f2a90b9693f2c7a0b5c7048f186318937f3dd3831162c4130d88e2b185a5047db15e284041c70f1f42da512f42e5e85c13256018982cf2739244a31874328
Size (go1.14.src.tar.gz) = 22377333 bytes
SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 990a54e3baf239916e4c7f0c1d54240e2898601a
SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d
SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577
SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b

View File

@ -1,16 +0,0 @@
$NetBSD: patch-misc_io_clangwrap.sh,v 1.1 2019/12/07 21:34:18 bsiegert Exp $
--- misc/ios/clangwrap.sh.orig 2015-12-03 00:52:58.000000000 +0000
+++ misc/ios/clangwrap.sh
@@ -8,9 +8,9 @@ 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" == "arm" ]; then
+if [ "$GOARCH" = "arm" ]; then
CLANGARCH="armv7"
-elif [ "$GOARCH" == "arm64" ]; then
+elif [ "$GOARCH" = "arm64" ]; then
CLANGARCH="arm64"
else
echo "unknown GOARCH=$GOARCH" >&2

View File

@ -1,16 +0,0 @@
$NetBSD: patch-src_cmd_dist_util.go,v 1.1 2019/12/07 21:34:18 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"

View File

@ -1,104 +0,0 @@
$NetBSD: patch-src_cmd_link_internal_ld_elf.go,v 1.1 2019/12/07 21:34:18 bsiegert Exp $
--- src/cmd/link/internal/ld/elf.go.orig 2018-08-24 20:38:35.000000000 +0000
+++ src/cmd/link/internal/ld/elf.go
@@ -819,10 +819,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 = 599000000 /* NetBSD 5.99 */
+ ELF_NOTE_NETBSD_NAMESZ = 7
+ ELF_NOTE_NETBSD_DESCSZ = 4
+ ELF_NOTE_NETBSD_TAG = 1
+ ELF_NOTE_NETBSD_VERSION = 599000000 /* NetBSD 5.99 */
+ ELF_NOTE_NETBSD_MARCH_NAMESZ = 7
+ ELF_NOTE_NETBSD_MARCH_TAG = 5
)
var ELF_NOTE_NETBSD_NAME = []byte("NetBSD\x00")
@@ -832,6 +834,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)
@@ -848,6 +867,22 @@ func elfwritenetbsdsig(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
@@ -1450,6 +1485,9 @@ func (ctxt *Link) doelf() {
}
if ctxt.HeadType == objabi.Hnetbsd {
Addstring(shstrtab, ".note.netbsd.ident")
+ if ctxt.Arch.Family == sys.ARM {
+ Addstring(shstrtab, ".note.netbsd.march")
+ }
}
if ctxt.HeadType == objabi.Hopenbsd {
Addstring(shstrtab, ".note.openbsd.ident")
@@ -1888,6 +1926,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")
@@ -2230,6 +2277,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))

View File

@ -1,10 +0,0 @@
$NetBSD: patch-src_crypto_x509_root__bsd.go,v 1.1 2019/12/07 21:34:18 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
}

View File

@ -1,21 +0,0 @@
$NetBSD: patch-src_runtime_os__netbsd.go,v 1.1 2019/12/07 21:34:18 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)

View File

@ -1,14 +0,0 @@
$NetBSD: patch-src_syscall_zsysnum__solaris__amd64.go,v 1.1 2019/12/07 21:34:18 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
)