Skip to content

Commit

Permalink
Pullup ticket #5396 - requested by sevan
Browse files Browse the repository at this point in the history
lang/go: bugfix

Revisions pulled up:
- lang/go/Makefile                                              1.51
- lang/go/distinfo                                              1.47
- lang/go/patches/patch-src_runtime_mem__bsd.go                 1.1
- lang/go/patches/patch-src_syscall_syscall__solaris.go         deleted

---
   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
  • Loading branch information
bsiegert committed May 6, 2017
1 parent a7bf6d3 commit 7d3ff88
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 24 deletions.
10 changes: 2 additions & 8 deletions lang/go/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.49.2.1 2017/04/29 19:32:54 bsiegert Exp $
# $NetBSD: Makefile,v 1.49.2.2 2017/05/06 15:19:40 bsiegert 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/

Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lang/go/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.44.2.1 2017/04/29 19:32:54 bsiegert Exp $
$NetBSD: distinfo,v 1.44.2.2 2017/05/06 15:19:40 bsiegert Exp $

SHA1 (go1.8.src.tar.gz) = 37945c372140c3a46c2c5b4b9ce382b6c8d88811
RMD160 (go1.8.src.tar.gz) = 12f2840f1fd321f9d6be4dc066da6392ac30a2c3
Expand All @@ -7,5 +7,5 @@ Size (go1.8.src.tar.gz) = 15320083 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 changes: 25 additions & 0 deletions lang/go/patches/patch-src_runtime_mem__bsd.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
$NetBSD: patch-src_runtime_mem__bsd.go,v 1.1.2.2 2017/05/06 15:19:40 bsiegert 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 changes: 0 additions & 14 deletions lang/go/patches/patch-src_syscall_syscall__solaris.go

This file was deleted.

0 comments on commit 7d3ff88

Please sign in to comment.