From 4d5f77bd76b47dd6d98f62f7e5b43c9eaa29c58e Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Fri, 3 Feb 2023 23:06:22 +0800
Subject: [PATCH] bump to golang 1.20

---
 README.md          |  2 +-
 golang-compiler.mk |  3 ---
 golang/Makefile    | 18 +++++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index de075d6..616eecb 100644
--- a/README.md
+++ b/README.md
@@ -4,5 +4,5 @@
 
 ```shell
 rm -rf feeds/packages/lang/golang
-svn export https://github.com/sbwml/packages_lang_golang/trunk feeds/packages/lang/golang
+svn export https://github.com/sbwml/packages_lang_golang/branches/20.x feeds/packages/lang/golang
 ```
diff --git a/golang-compiler.mk b/golang-compiler.mk
index c6c8360..b4b4762 100644
--- a/golang-compiler.mk
+++ b/golang-compiler.mk
@@ -73,9 +73,6 @@ define GoCompiler/Default/Install/Bin
 	$(INSTALL_BIN) -p "$(1)/bin/$(4)"/* "$(2)/lib/go-$(3)/bin/"
   endif
 
-	$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg"
-	$(CP) "$(1)/pkg/$(4)$(if $(5),_$(5))" "$(2)/lib/go-$(3)/pkg/"
-
 	$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg/tool/$(4)"
 	$(INSTALL_BIN) -p "$(1)/pkg/tool/$(4)"/* "$(2)/lib/go-$(3)/pkg/tool/$(4)/"
 endef
diff --git a/golang/Makefile b/golang/Makefile
index 0d77906..ef9248b 100644
--- a/golang/Makefile
+++ b/golang/Makefile
@@ -7,8 +7,8 @@
 
 include $(TOPDIR)/rules.mk
 
-GO_VERSION_MAJOR_MINOR:=1.19
-GO_VERSION_PATCH:=5
+GO_VERSION_MAJOR_MINOR:=1.20
+GO_VERSION_PATCH:=
 
 PKG_NAME:=golang
 PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
@@ -20,7 +20,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:=8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f
+PKG_HASH:=3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33
 
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@@ -69,9 +69,13 @@ HOST_GO_VALID_OS_ARCH:= \
   \
   openbsd_mips64
 
-BOOTSTRAP_SOURCE:=go1.4-bootstrap-20171003.tar.gz
+ifeq ($(HOST_ARCH),x86_64)
+	PKG_ARCH:=amd64
+endif
+
+BOOTSTRAP_SOURCE:=go1.17.3.linux-$(PKG_ARCH).tar.gz
 BOOTSTRAP_SOURCE_URL:=$(GO_SOURCE_URLS)
-BOOTSTRAP_HASH:=f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52
+BOOTSTRAP_HASH:=skip
 
 BOOTSTRAP_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap
 
@@ -213,10 +217,6 @@ define Host/Compile
 
 	mkdir -p "$(GO_BUILD_CACHE_DIR)"
 
-	$(call GoCompiler/Bootstrap/Make, \
-		$(HOST_GO_VARS) \
-	)
-
 	$(call GoCompiler/Host/Make, \
 		GOROOT_BOOTSTRAP="$(BOOTSTRAP_ROOT_DIR)" \
 		$(if $(HOST_GO_ENABLE_PIE),GO_LDFLAGS="-buildmode pie") \