CVS commit: pkgsrc/lang/go

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Tue May  2 17:15:31 UTC 2017

Modified Files:
        pkgsrc/lang/go: Makefile distinfo
Added Files:
        pkgsrc/lang/go/patches: patch-src_runtime_mem__bsd.go
Removed Files:
        pkgsrc/lang/go/patches: patch-src_syscall_syscall__solaris.go

Log Message:
* Remove patch adding syscall.Dup2() for SunOS, software should be using unix.Dup2() instead.
  https://github.com/joyent/pkgsrc/pull/492
* Improve handling of low-memory situations on Illumos.
  https://github.com/joyent/pkgsrc/pull/493


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/go/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/lang/go/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/go/patches/patch-src_runtime_mem__bsd.go
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/go/patches/patch-src_syscall_syscall__solaris.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/go/Makefile
diff -u pkgsrc/lang/go/Makefile:1.50 pkgsrc/lang/go/Makefile:1.51
--- pkgsrc/lang/go/Makefile:1.50        Wed Apr 19 21:27:31 2017
+++ pkgsrc/lang/go/Makefile     Tue May  2 17:15:31 2017
@@ -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
 

Index: pkgsrc/lang/go/distinfo
diff -u pkgsrc/lang/go/distinfo:1.46 pkgsrc/lang/go/distinfo:1.47
--- pkgsrc/lang/go/distinfo:1.46        Wed Apr 19 21:27:31 2017
+++ pkgsrc/lang/go/distinfo     Tue May  2 17:15:31 2017
@@ -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 byt
 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

Added files:

Index: pkgsrc/lang/go/patches/patch-src_runtime_mem__bsd.go
diff -u /dev/null pkgsrc/lang/go/patches/patch-src_runtime_mem__bsd.go:1.1
--- /dev/null   Tue May  2 17:15:31 2017
+++ pkgsrc/lang/go/patches/patch-src_runtime_mem__bsd.go        Tue May  2 17:15:31 2017
@@ -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 {