mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-03 11:22:56 +02:00
go: update to 1.14
This commit is contained in:
parent
aacdf50877
commit
6c881688b9
2 changed files with 3 additions and 31 deletions
|
@ -1,28 +0,0 @@
|
|||
From e1b1b7856f416ca6ff086adc00adc89fd900992c Mon Sep 17 00:00:00 2001
|
||||
From: Brad Fitzpatrick <bradfitz@golang.org>
|
||||
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 <bradfitz@golang.org>
|
||||
TryBot-Result: Gobot Gobot <gobot@golang.org>
|
||||
Reviewed-by: Cherry Zhang <cherryyz@google.com>
|
||||
---
|
||||
|
||||
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
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'go'
|
||||
pkgname=go
|
||||
version=1.13.8
|
||||
version=1.14
|
||||
revision=1
|
||||
create_wrksrc=yes
|
||||
build_wrksrc=go
|
||||
|
@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
|
|||
license="BSD-3-Clause"
|
||||
homepage="http://golang.org/"
|
||||
distfiles="https://golang.org/dl/go${version}.src.tar.gz"
|
||||
checksum=b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34
|
||||
checksum=6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
|
||||
|
@ -21,7 +21,7 @@ case "${XBPS_TARGET_MACHINE}" in
|
|||
i686*) _goarch=386 ;;
|
||||
x86_64*) _goarch=amd64 ;;
|
||||
ppc64le*) _goarch=ppc64le ;;
|
||||
ppc64*) broken="Upstream does not support ELFv2 for big endian ppc64";;
|
||||
ppc64*) _goarch=ppc64;;
|
||||
ppc*) broken="Upstream does not support 32-bit ppc";;
|
||||
*) _goarch=${XBPS_TARGET_MACHINE} ;;
|
||||
esac
|
||||
|
|
Loading…
Add table
Reference in a new issue