golang: bump to 1.22.12

golang: bump to 1.22.11
golang: bump to 1.22.10
2025-02-05 02:00:19 +08:00 · 2025-01-17 05:00:14 +08:00 · 2024-12-04 03:00:11 +08:00 · 2024-11-07 07:00:15 +08:00 · 2024-10-02 02:00:23 +08:00 · 2024-09-06 00:00:21 +08:00
7 changed files with 36 additions and 55 deletions
--- a/README.md
+++ b/README.md
@ -2,9 +2,7 @@

 ## How to use?

-After the `./scripts/feeds install -a` operation is completed, execute the following command:
-
 ```shell
 rm -rf feeds/packages/lang/golang
-git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
+git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang
 ```
--- a/golang-build.sh
+++ b/golang-build.sh
@ -1,10 +1,4 @@
 #!/bin/sh
-#
-# Copyright (C) 2020, 2022 Jeffery To
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#

 nl="
 "
@ -120,7 +114,7 @@ build() {
 	if [ "$GO_GO_GENERATE" = 1 ]; then
 		log "Calling go generate"
 		# shellcheck disable=SC2086
-		GOOS='' GOARCH='' GO386='' GOARM='' GOARM64='' GOMIPS='' GOMIPS64='' GORISCV64=''\
+		GOOS='' GOARCH='' GO386='' GOARM='' GOMIPS='' GOMIPS64='' \
 		go generate -v $targets
 		log
 	fi
--- a/golang-compiler.mk
+++ b/golang-compiler.mk
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018, 2020-2021, 2023 Jeffery To
+# Copyright (C) 2018, 2020 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -19,15 +19,15 @@ define GoCompiler/Default/CheckHost
 endef

 # $(1) source go root
-# $(2) additional environment variables (optional)
+# $(2) destination prefix
+# $(3) go version id
+# $(4) additional environment variables (optional)
 define GoCompiler/Default/Make
 	( \
 		cd "$(1)/src" ; \
-		$(2) \
-		$(BASH) make.bash \
-		$(if $(findstring s,$(OPENWRT_VERBOSE)),-v) \
-		--no-banner \
-		; \
+		$(if $(2),GOROOT_FINAL="$(2)/lib/go-$(3)") \
+		$(4) \
+		$(BASH) make.bash --no-banner ; \
 	)
 endef

@ -74,11 +74,6 @@ define GoCompiler/Default/Install/Bin
 	$(INSTALL_BIN) -p "$(1)/bin/$(4)"/* "$(2)/lib/go-$(3)/bin/"
  endif

-	if [ -d "$(1)/pkg/$(4)$(if $(5),_$(5))" ]; then \
-		$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg" ; \
-		$(CP) "$(1)/pkg/$(4)$(if $(5),_$(5))" "$(2)/lib/go-$(3)/pkg/" ; \
-	fi
-
 	$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg/tool/$(4)"
 	$(INSTALL_BIN) -p "$(1)/pkg/tool/$(4)"/* "$(2)/lib/go-$(3)/pkg/tool/$(4)/"
 endef
@ -153,7 +148,7 @@ define GoCompiler/AddProfile

  # $$(1) additional environment variables (optional)
  define GoCompiler/$(1)/Make
-	$$(call GoCompiler/Default/Make,$(2),$$(1))
+	$$(call GoCompiler/Default/Make,$(2),$(3),$(4),$$(1))
  endef

  # $$(1) override install prefix (optional)
--- a/golang-host-build.mk
+++ b/golang-host-build.mk
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020, 2022 Jeffery To
+# Copyright (C) 2020 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/golang-package.mk
+++ b/golang-package.mk
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 Jeffery To
+# Copyright (C) 2018-2020 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/golang-values.mk
+++ b/golang-values.mk
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2023 Jeffery To
+# Copyright (C) 2018, 2020 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -28,8 +28,8 @@ unexport \
  GOFLAGS \
  GOOS \
  GOPATH \
-  GOROOT \
  GOTOOLCHAIN \
+  GOROOT \
  GOTMPDIR \
  GOWORK
 # Unmodified:
@ -59,19 +59,13 @@ unexport \
 # Architecture-specific environment variables:
 unexport \
  GOARM \
-  GOARM64 \
  GO386 \
  GOAMD64 \
  GOMIPS \
  GOMIPS64 \
  GOPPC64 \
-  GORISCV64 \
  GOWASM

-# Environment variables for use with code coverage:
-unexport \
-  GOCOVERDIR
-
 # Special-purpose environment variables:
 unexport \
  GCCGOTOOLDIR \
@ -84,7 +78,6 @@ unexport \
 # From https://pkg.go.dev/runtime#hdr-Environment_Variables
 unexport \
  GOGC \
-  GOMEMLIMIT \
  GOMAXPROCS \
  GORACE \
  GOTRACEBACK
@ -130,11 +123,10 @@ unexport \
 go_arch=$(subst \
  aarch64,arm64,$(subst \
  i386,386,$(subst \
-  loongarch64,loong64,$(subst \
  mipsel,mipsle,$(subst \
  mips64el,mips64le,$(subst \
  powerpc64,ppc64,$(subst \
-  x86_64,amd64,$(1))))))))
+  x86_64,amd64,$(1)))))))

 GO_OS:=linux
 GO_ARCH:=$(call go_arch,$(ARCH))
@ -205,16 +197,17 @@ endif

 # Target Go

-GO_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||loongarch64||mips||mips64||mips64el||mipsel||powerpc64||riscv64||x86_64)
+GO_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mips64||mips64el||mipsel||powerpc64||x86_64)


 # ASLR/PIE

-# From https://go.dev/src/internal/platform/supported.go
+# From https://go.dev/src/cmd/internal/sys/supported.go
 GO_PIE_SUPPORTED_OS_ARCH:= \
  android_386  android_amd64  android_arm  android_arm64 \
  linux_386    linux_amd64    linux_arm    linux_arm64 \
-  windows_386  windows_amd64  windows_arm  windows_arm64 \
+  \
+  windows_386  windows_amd64  windows_arm \
  \
  darwin_amd64 darwin_arm64 \
  ios_amd64    ios_arm64 \
@ -226,7 +219,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \
  linux_loong64 linux_ppc64le linux_riscv64 linux_s390x

 # From https://go.dev/src/cmd/go/internal/work/init.go
-go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm windows_arm64),,shared)
+go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm),,shared)

 ifneq ($(filter $(GO_HOST_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),)
  GO_HOST_PIE_SUPPORTED:=1
--- a/golang/Makefile
+++ b/golang/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2023 Jeffery To
+# Copyright (C) 2018, 2020 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -7,8 +7,8 @@

 include $(TOPDIR)/rules.mk

-GO_VERSION_MAJOR_MINOR:=1.25rc1
-GO_VERSION_PATCH:=
+GO_VERSION_MAJOR_MINOR:=1.22
+GO_VERSION_PATCH:=12

 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:=0cd6772fe133a784fbb7a09d6da3089897fef48d03a21721434bf88188a58629
+PKG_HASH:=012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71

 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
@ -30,10 +30,11 @@ PKG_CPE_ID:=cpe:/a:golang:go
 PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=no-mips16
+PKG_USE_MIPS16:=0

 PKG_GO_PREFIX:=/usr
 PKG_GO_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR)
+PKG_GO_ROOT:=$(PKG_GO_PREFIX)/lib/go-$(PKG_GO_VERSION_ID)

 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/go-$(PKG_VERSION)
 HOST_BUILD_PARALLEL:=1
@ -57,33 +58,33 @@ HOST_GO_VALID_OS_ARCH:= \
  \
  dragonfly_amd64 \
  illumos_amd64 \
+  freebsd_riscv64 \
  solaris_amd64 \
  \
  aix_ppc64 \
  js_wasm \
  wasip1_wasm \
  \
-  freebsd_riscv64 \
-  openbsd_riscv64 \
-  \
  linux_ppc64 linux_ppc64le \
  linux_mips linux_mipsle linux_mips64 linux_mips64le \
-  linux_loong64 linux_riscv64 linux_s390x \
+  linux_riscv64 linux_s390x \
+  linux_loong64 \
  \
  openbsd_mips64

 ifeq ($(HOST_ARCH),x86_64)
 	PKG_ARCH:=amd64
-	BOOTSTRAP_HASH:=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616
+	SHA256:=b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb
 endif

 ifeq ($(HOST_ARCH),aarch64)
 	PKG_ARCH:=arm64
-	BOOTSTRAP_HASH:=c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2
+	SHA256:=4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b
 endif

-BOOTSTRAP_SOURCE:=go1.22.6.linux-$(PKG_ARCH).tar.gz
+BOOTSTRAP_SOURCE:=go1.20.6.linux-$(PKG_ARCH).tar.gz
 BOOTSTRAP_SOURCE_URL:=$(GO_SOURCE_URLS)
+BOOTSTRAP_HASH:=$(SHA256)

 BOOTSTRAP_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap

@ -193,7 +194,8 @@ ifeq ($(BOOTSTRAP_ROOT_DIR),)
  $(eval $(call Download,golang-bootstrap))

  define Bootstrap/Prepare
-	mkdir -p "$(BOOTSTRAP_BUILD_DIR)" && $(BOOTSTRAP_UNPACK) ;
+	mkdir -p "$(BOOTSTRAP_BUILD_DIR)"
+	$(BOOTSTRAP_UNPACK)
  endef
  Hooks/HostPrepare/Post+=Bootstrap/Prepare

@ -213,7 +215,6 @@ endif
 $(eval $(call GoCompiler/AddProfile,Host,$(HOST_BUILD_DIR),$(HOST_GO_PREFIX),$(HOST_GO_VERSION_ID),$(GO_HOST_OS_ARCH),$(HOST_GO_INSTALL_SUFFIX)))

 HOST_GO_VARS= \
-	GOHOSTARCH="$(GO_HOST_ARCH)" \
 	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
 	GOENV=off \
 	CC="$(HOSTCC_NOCACHE)" \
@ -279,7 +280,6 @@ PKG_GO_ZBOOTSTRAP_MODS:= \
 PKG_GO_ZBOOTSTRAP_PATH:=$(PKG_BUILD_DIR)/src/internal/buildcfg/zbootstrap.go

 PKG_GO_VARS= \
-	GOHOSTARCH="$(GO_HOST_ARCH)" \
 	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
 	GOENV=off \
 	GO_GCC_HELPER_PATH="$$$$PATH" \
@ -339,6 +339,7 @@ define Build/Compile
 		cd "$(PKG_BUILD_DIR)/bin" ; \
 		export $(GO_PKG_TARGET_VARS) ; \
 		$(CP) go go-host ; \
+		GOROOT_FINAL="$(PKG_GO_ROOT)" \
 		GO_GCC_HELPER_CC="$(TARGET_CC)" \
 		GO_GCC_HELPER_CXX="$(TARGET_CXX)" \
 		$(PKG_GO_VARS) \
Author	SHA1	Message	Date
gitea-action	bfab625907	golang: bump to 1.22.12	2025-02-05 02:00:19 +08:00
gitea-action	2be5dda0bb	golang: bump to 1.22.11	2025-01-17 05:00:14 +08:00
gitea-action	9bd81c1e9a	golang: bump to 1.22.10	2024-12-04 03:00:11 +08:00
gitea-action	acc4979e2e	golang: bump to 1.22.9	2024-11-07 07:00:15 +08:00
gitea-action	d836480d91	golang: bump to 1.22.8	2024-10-02 02:00:23 +08:00
sbwml	760b16b4e4	golang: bump to 1.22.7	2024-09-06 00:00:21 +08:00
actions	d90858eb2c	golang: bump to 1.22.6	2024-08-07 02:00:30 +08:00