kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Remove patch adding syscall.Dup2() for SunOS, software should be using unix.Dup2() instead.

Browse source 
https://github.com/joyent/pkgsrc/pull/492
* Improve handling of low-memory situations on Illumos.
  https://github.com/joyent/pkgsrc/pull/493
This commit is contained in:
fhajny 2017-05-02 17:15:31 +00:00
parent 0587410ac3
commit 42ae76dcb5
4 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lang/go/Makefile
View file

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.50 2017/04/19 21:27:31 christos Exp $
# $NetBSD: Makefile,v 1.51 2017/05/02 17:15:31 fhajny Exp $
.include "version.mk"
DISTNAME= go${GO_VERSION}.src
PKGNAME= go-${GO_VERSION}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= https://storage.googleapis.com/golang/
@ -84,12 +84,6 @@ PLIST_VARS+= route
PLIST.route= yes
.endif
pre-build:
cd ${WRKSRC}/src/syscall && \
env GOOS=${LOWER_OPSYS:Q} GOARCH=${GOARCH:Q} \
${PERL5} mksyscall_solaris.pl \
syscall_solaris.go syscall_solaris_amd64.go > zsyscall_solaris_amd64.go
do-build:
cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} ${BASH} ./make.bash

4
lang/go/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.46 2017/04/19 21:27:31 christos Exp $
$NetBSD: distinfo,v 1.47 2017/05/02 17:15:31 fhajny Exp $
SHA1 (go1.8.1.src.tar.gz) = 0c4b7116bd6b7cdc19bdcf8336c75eae4620907b
RMD160 (go1.8.1.src.tar.gz) = c0251b667a9c34f9dd180aeb8c4c9dce5832b9eb
@ -7,5 +7,5 @@ Size (go1.8.1.src.tar.gz) = 15331455 bytes
SHA1 (patch-lib_time_update.bash) = bcf565b97ae7898a9e5cef7686fe42c69bc0bba1
SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
SHA1 (patch-src_crypto_x509_root__bsd.go) = 0eca1eafa967268ae9b224be4aeda347ebc91901
SHA1 (patch-src_runtime_mem__bsd.go) = ceaeb6714c7793c1e3f967709e29bf394f94d4e8
SHA1 (patch-src_runtime_os__netbsd.go) = 561f53c084c5bff93171a411bebd79bebf1e3696
SHA1 (patch-src_syscall_syscall__solaris.go) = 436371947897dcba574a6dfecc6bbcd04f6e25b2

25
lang/go/patches/patch-src_runtime_mem__bsd.go Normal file
View file

@ -0,0 +1,25 @@
$NetBSD: patch-src_runtime_mem__bsd.go,v 1.1 2017/05/02 17:15:31 fhajny Exp $
Improve handling of low-memory situations on Illumos.
https://github.com/joyent/pkgsrc/pull/493
--- src/runtime/mem_bsd.go.orig 2017-04-28 12:14:22.000000000 -0700
+++ src/runtime/mem_bsd.go 2017-04-28 12:14:31.000000000 -0700
@@ -76,7 +76,7 @@
flags |= _MAP_FIXED
}
p := mmap(v, n, _PROT_READ|_PROT_WRITE, flags, -1, 0)
- if uintptr(p) == _ENOMEM {
+ if uintptr(p) == _ENOMEM || (GOOS == "solaris" && uintptr(p) == _EAGAIN) {
throw("runtime: out of memory")
}
if p != v {
@@ -87,7 +87,7 @@
}
p := mmap(v, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_FIXED|_MAP_PRIVATE, -1, 0)
- if uintptr(p) == _ENOMEM {
+ if uintptr(p) == _ENOMEM || (GOOS == "solaris" && uintptr(p) == _EAGAIN) {
throw("runtime: out of memory")
}
if p != v {

14
lang/go/patches/patch-src_syscall_syscall__solaris.go
View file

@ -1,14 +0,0 @@
$NetBSD: patch-src_syscall_syscall__solaris.go,v 1.1 2015/08/25 23:09:51 fhajny Exp $
Add support for the Dup2 syscall.
--- src/syscall/syscall_solaris.go.orig 2015-08-19 06:05:19.000000000 +0000
+++ src/syscall/syscall_solaris.go
@@ -440,6 +440,7 @@ func SendmsgN(fd int, p, oob []byte, to
//sys Chroot(path string) (err error)
//sys Close(fd int) (err error)
//sys Dup(fd int) (nfd int, err error)
+//sys Dup2(from int, to int) (err error)
//sys Exit(code int)
//sys Fchdir(fd int) (err error)
//sys Fchmod(fd int, mode uint32) (err error)