From b26e054d06ceb76d0ceee39f5db278bdc100ea80 Mon Sep 17 00:00:00 2001 From: "taketori at x10d.jp" Date: Mon, 11 Sep 2017 00:11:56 +0900 Subject: [PATCH] go: Update to 1.9 (#2871) --- .../0010-go1.7-proper-go-binary-path.patch | 16 ++++++++-------- mingw-w64-go/PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mingw-w64-go/0010-go1.7-proper-go-binary-path.patch b/mingw-w64-go/0010-go1.7-proper-go-binary-path.patch index 11f32cbfc2..d9f62a2032 100644 --- a/mingw-w64-go/0010-go1.7-proper-go-binary-path.patch +++ b/mingw-w64-go/0010-go1.7-proper-go-binary-path.patch @@ -1,16 +1,16 @@ diff --git a/src/cmd/dist/buildtool.go b/src/cmd/dist/buildtool.go -index a535316..b218c6a 100644 +index 8a3db32ad3..de9733e1c7 100644 --- a/src/cmd/dist/buildtool.go +++ b/src/cmd/dist/buildtool.go -@@ -119,7 +119,7 @@ func bootstrapBuildTools() { - // https://groups.google.com/d/msg/golang-dev/Ss7mCKsvk8w/Gsq7VYI0AwAJ +@@ -164,7 +164,7 @@ func bootstrapBuildTools() { // Use the math_big_pure_go build tag to disable the assembly in math/big // which may contain unsupported instructions. -- run(workspace, ShowOutput|CheckExit, pathf("%s/bin/go", goroot_bootstrap), "install", "-gcflags=-l", "-tags=math_big_pure_go", "-v", "bootstrap/cmd/...") -+ run(workspace, ShowOutput|CheckExit, "go", "install", "-gcflags=-l", "-tags=math_big_pure_go", "-v", "bootstrap/cmd/...") - - // Copy binaries into tool binary directory. - for _, name := range bootstrapDirs { + cmd := []string{ +- pathf("%s/bin/go", goroot_bootstrap), ++ "go", + "install", + "-gcflags=-l", + "-tags=math_big_pure_go", diff --git a/src/make.bat b/src/make.bat index bf25b95..a4e3bf1 100644 --- a/src/make.bat diff --git a/mingw-w64-go/PKGBUILD b/mingw-w64-go/PKGBUILD index 5152f94aeb..3c0eb83738 100644 --- a/mingw-w64-go/PKGBUILD +++ b/mingw-w64-go/PKGBUILD @@ -4,7 +4,7 @@ _realname=go pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc="Go Lang (mingw-w64)" arch=('any') @@ -17,8 +17,8 @@ options=('!strip') source=("https://storage.googleapis.com/golang/go${pkgver}.src.tar.gz" 0010-go1.7-proper-go-binary-path.patch 0011-add-GO_BUILD_VERBOSE.patch) -sha256sums=('406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596' - '41ff1f94ab4e1b254884d3674cc6729e9b11de0c689c56d1ad3ac1223855d1f3' +sha256sums=('a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993' + '1908453ccbacd83360ab4ae5490a904f695202ff1a49fb9e4912f3b4c384188f' 'c7f9a39a4b29668276d5836d2c1e1d5c8017c6dd66b976f519e9f5e85383ab85') prepare() {