Skip to content

Commit 29ae219

Browse files
jefferytoBKPepe
authored andcommitted
golang: Update to 1.21.0, remove patch
Upstream has updated the Go compiler to not use gold when building for arm, and is waiting for a fix to binutils (released in 2.41) before doing the same for aarch64.[1] Based on the above, it does not appear that golang/go#49748 will be merged. This removes the patch from that pull request. [1]: golang/go#22040 Signed-off-by: Jeffery To <[email protected]> (cherry picked from commit a80af7e)
1 parent c6656a6 commit 29ae219

File tree

5 files changed

+11
-55
lines changed

5 files changed

+11
-55
lines changed

lang/golang/golang-compiler.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,10 @@ define GoCompiler/Default/Install/Bin
6060

6161
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),api)
6262

63+
$(INSTALL_DATA) -p "$(1)/go.env" "$(2)/lib/go-$(3)/"
6364
$(INSTALL_DATA) -p "$(1)/VERSION" "$(2)/lib/go-$(3)/"
6465

65-
for file in AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS README.md SECURITY.md; do \
66+
for file in CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md; do \
6667
if [ -f "$(1)/$$$$file" ]; then \
6768
$(INSTALL_DATA) -p "$(1)/$$$$file" "$(2)/share/go-$(3)/" ; \
6869
fi ; \

lang/golang/golang-package.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ GO_PKG_BUILD_VARS= \
215215
GOPATH="$(GO_PKG_BUILD_DIR)" \
216216
GOCACHE="$(GO_BUILD_CACHE_DIR)" \
217217
GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
218-
GOENV=off
218+
GOENV=off \
219+
GOTOOLCHAIN=local
219220

220221
GO_PKG_VARS= \
221222
$(GO_PKG_TARGET_VARS) \

lang/golang/golang-values.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ unexport \
2929
GOOS \
3030
GOPATH \
3131
GOROOT \
32+
GOTOOLCHAIN \
3233
GOTMPDIR \
3334
GOWORK
3435
# Unmodified:
@@ -219,7 +220,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \
219220
\
220221
aix_ppc64 \
221222
\
222-
linux_ppc64le linux_riscv64 linux_s390x
223+
linux_loong64 linux_ppc64le linux_riscv64 linux_s390x
223224

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

lang/golang/golang/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
include $(TOPDIR)/rules.mk
99

10-
GO_VERSION_MAJOR_MINOR:=1.20
11-
GO_VERSION_PATCH:=7
10+
GO_VERSION_MAJOR_MINOR:=1.21
11+
GO_VERSION_PATCH:=0
1212

1313
PKG_NAME:=golang
1414
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/ \
2020

2121
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
2222
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
23-
PKG_HASH:=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
23+
PKG_HASH:=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
2424

2525
PKG_MAINTAINER:=Jeffery To <[email protected]>
2626
PKG_LICENSE:=BSD-3-Clause
@@ -62,6 +62,7 @@ HOST_GO_VALID_OS_ARCH:= \
6262
\
6363
aix_ppc64 \
6464
js_wasm \
65+
wasip1_wasm \
6566
\
6667
freebsd_riscv64 \
6768
\
@@ -296,7 +297,7 @@ $(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$(
296297
PKG_GO_ZBOOTSTRAP_MODS:= \
297298
s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \
298299
s/defaultGOAMD64 = `[^`]*`/defaultGOAMD64 = `$(or $(GO_AMD64),v1)`/; \
299-
s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),5)`/; \
300+
s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),7)`/; \
300301
s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \
301302
s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \
302303
s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/;

lang/golang/golang/patches/001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)