Skip to content

Commit

Permalink
golang: Update to 1.21.0, remove patch
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
jefferyto committed Aug 15, 2023
1 parent 4917405 commit a80af7e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 55 deletions.
3 changes: 2 additions & 1 deletion lang/golang/golang-compiler.mk
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ define GoCompiler/Default/Install/Bin

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

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

for file in AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS README.md SECURITY.md; do \
for file in CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md; do \
if [ -f "$(1)/$$$$file" ]; then \
$(INSTALL_DATA) -p "$(1)/$$$$file" "$(2)/share/go-$(3)/" ; \
fi ; \
Expand Down
3 changes: 2 additions & 1 deletion lang/golang/golang-package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ GO_PKG_BUILD_VARS= \
GOPATH="$(GO_PKG_BUILD_DIR)" \
GOCACHE="$(GO_BUILD_CACHE_DIR)" \
GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
GOENV=off
GOENV=off \
GOTOOLCHAIN=local

GO_PKG_VARS= \
$(GO_PKG_TARGET_VARS) \
Expand Down
3 changes: 2 additions & 1 deletion lang/golang/golang-values.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ unexport \
GOOS \
GOPATH \
GOROOT \
GOTOOLCHAIN \
GOTMPDIR \
GOWORK
# Unmodified:
Expand Down Expand Up @@ -219,7 +220,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \
\
aix_ppc64 \
\
linux_ppc64le linux_riscv64 linux_s390x
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)
Expand Down
9 changes: 5 additions & 4 deletions lang/golang/golang/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

include $(TOPDIR)/rules.mk

GO_VERSION_MAJOR_MINOR:=1.20
GO_VERSION_PATCH:=7
GO_VERSION_MAJOR_MINOR:=1.21
GO_VERSION_PATCH:=0

PKG_NAME:=golang
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
Expand All @@ -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:=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
PKG_HASH:=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a

PKG_MAINTAINER:=Jeffery To <[email protected]>
PKG_LICENSE:=BSD-3-Clause
Expand Down Expand Up @@ -62,6 +62,7 @@ HOST_GO_VALID_OS_ARCH:= \
\
aix_ppc64 \
js_wasm \
wasip1_wasm \
\
freebsd_riscv64 \
\
Expand Down Expand Up @@ -296,7 +297,7 @@ $(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$(
PKG_GO_ZBOOTSTRAP_MODS:= \
s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \
s/defaultGOAMD64 = `[^`]*`/defaultGOAMD64 = `$(or $(GO_AMD64),v1)`/; \
s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),5)`/; \
s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),7)`/; \
s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \
s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \
s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/;
Expand Down

This file was deleted.

0 comments on commit a80af7e

Please sign in to comment.