Merge pull request #12187 from jefferyto/golang-1.13.11-default-platform-options-openwrt-19.07

[openwrt-19.07] golang: Update to 1.13.11, set default platform options
This commit is contained in:
Hannu Nyman 2020-05-16 23:36:22 +03:00 committed by GitHub
commit 5e9f5cd769
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions

View file

@ -11,4 +11,4 @@ endif
GO_VERSION_MAJOR_MINOR:=1.13
GO_VERSION_PATCH:=10
GO_VERSION_PATCH:=11

View file

@ -18,7 +18,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
PKG_HASH:=eb9ccc8bf59ed068e7eff73e154e4f5ee7eec0a47a610fb864e3332a2fdc8b8c
PKG_HASH:=89ed1abce25ad003521c125d6583c93c1280de200ad221f961085200a6c00679
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=BSD-3-Clause
@ -148,6 +148,13 @@ This package provides the Go programming language source files needed
for cross-compilation.
endef
PKG_GO_ZBOOTSTRAP_MODS:= \
s/defaultGO386 = `[^`]*`/defaultGO386 = `$(if $(GO_386),$(GO_386),387)`/; \
s/defaultGOARM = `[^`]*`/defaultGOARM = `$(if $(GO_ARM),$(GO_ARM),5)`/; \
s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(if $(GO_MIPS),$(GO_MIPS),hardfloat)`/; \
s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(if $(GO_MIPS64),$(GO_MIPS64),hardfloat)`/; \
s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `power8`/;
define Download/golang-bootstrap
FILE:=$(BOOTSTRAP_SOURCE)
URL:=$(BOOTSTRAP_SOURCE_URL)
@ -233,6 +240,11 @@ define Build/Compile
PATH=$(HOST_GO_ROOT)/openwrt:$$$$PATH \
)
ifneq ($(PKG_GO_ZBOOTSTRAP_MODS),)
$(SED) '$(PKG_GO_ZBOOTSTRAP_MODS)' \
$(PKG_BUILD_DIR)/src/cmd/internal/objabi/zbootstrap.go
endif
@echo "Building target Go second stage"
( \