From f52fbe1d494a09bb8928c36f873d9db3fe9377f9 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sun, 17 May 2020 03:30:07 +0800 Subject: [PATCH 1/2] golang: Update to 1.13.11 Signed-off-by: Jeffery To --- lang/golang/golang-version.mk | 2 +- lang/golang/golang/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/golang/golang-version.mk b/lang/golang/golang-version.mk index fa763b614..38f8bf214 100644 --- a/lang/golang/golang-version.mk +++ b/lang/golang/golang-version.mk @@ -11,4 +11,4 @@ endif GO_VERSION_MAJOR_MINOR:=1.13 -GO_VERSION_PATCH:=10 +GO_VERSION_PATCH:=11 diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index 81782e972..c242c1cc8 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -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 PKG_LICENSE:=BSD-3-Clause From d3762591dabb5c15c6e531a05801d0f0031fe67d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 14 May 2020 17:45:18 +0800 Subject: [PATCH 2/2] golang: Set/reset default platform options for target Go compiler Because the first stage for building target Go is actually a host build, the default platform options (GO386, GOARM, etc.) are detected from the host. These values are written to a source file and kept when building the second stage. This modifies this source file to set the appropriate values for the target platform, and reset values for other platforms to their cross-compiling / most compatible defaults. Signed-off-by: Jeffery To (cherry picked from commit da3fb97b9cef4f705dda4b190f99536f27d0955d) --- lang/golang/golang/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index c242c1cc8..5e26461f5 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -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" ( \