From 9068a45e49d6e590cc92f3d7c8b553b7e523e977 Mon Sep 17 00:00:00 2001 From: Noel Cower Date: Wed, 4 Sep 2019 11:17:42 -0700 Subject: [PATCH] go: update to 1.13.1. Includes a patch from https://go-review.googlesource.com/c/go/+/197602 to try to resolve i686 build failures reported in https://golang.org/issues/33977. --- .../go/patches/gohostarch-bootstrap-fix.patch | 28 +++++++++++++++++++ srcpkgs/go/template | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/go/patches/gohostarch-bootstrap-fix.patch diff --git a/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch new file mode 100644 index 00000000000..7791b92abe7 --- /dev/null +++ b/srcpkgs/go/patches/gohostarch-bootstrap-fix.patch @@ -0,0 +1,28 @@ +From e1b1b7856f416ca6ff086adc00adc89fd900992c Mon Sep 17 00:00:00 2001 +From: Brad Fitzpatrick +Date: Thu, 26 Sep 2019 19:04:00 +0000 +Subject: [PATCH] cmd/dist: fix bootstrap failure when GOHOSTARCH is set + +Fixes #33977 + +Change-Id: I4b136788f08b08c53087af8d3cd56125e620b51b +Reviewed-on: https://go-review.googlesource.com/c/go/+/197602 +Run-TryBot: Brad Fitzpatrick +TryBot-Result: Gobot Gobot +Reviewed-by: Cherry Zhang +--- + +diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go +index f293891..f27ea17 100644 +--- go/src/cmd/dist/buildtool.go ++++ go/src/cmd/dist/buildtool.go +@@ -250,6 +250,9 @@ + archCaps = fileArch + fileArch = strings.ToLower(fileArch) + fileArch = strings.TrimSuffix(fileArch, "splitload") ++ if fileArch == os.Getenv("GOHOSTARCH") { ++ return "", false ++ } + if fileArch == strings.TrimSuffix(runtime.GOARCH, "le") { + return "", false + } diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 683e651aa7a..f74f4c9a0ce 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -1,6 +1,6 @@ # Template file for 'go' pkgname=go -version=1.12.8 +version=1.13.1 revision=1 create_wrksrc=yes build_wrksrc=go @@ -10,7 +10,7 @@ maintainer="Michael Aldridge " license="BSD-3-Clause" homepage="http://golang.org/" distfiles="https://golang.org/dl/go${version}.src.tar.gz" -checksum=11ad2e2e31ff63fcf8a2bdffbe9bfa2e1845653358daed593c8c2d03453c9898 +checksum=81f154e69544b9fa92b1475ff5f11e64270260d46e7e36c34aafc8bc96209358 nostrip=yes noverifyrdeps=yes