openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-02 20:51:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "golang: Update to 1.18, update patch"

Browse Source 
This reverts commit 7b17e78223.
This commit is contained in:
lean 2022-03-31 13:42:19 +08:00
parent e80e26b267
commit c7499f8cde
5 changed files with 19 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/golang/golang-build.sh
View File

@ -56,7 +56,7 @@ configure() {
if [ "$GO_INSTALL_ALL" != 1 ]; then if [ "$GO_INSTALL_ALL" != 1 ]; then
code="$(printf '%s\n' "$files" | grep '\.\(c\|cc\|cpp\|go\|h\|hh\|hpp\|proto\|s\)$')" code="$(printf '%s\n' "$files" | grep '\.\(c\|cc\|cpp\|go\|h\|hh\|hpp\|proto\|s\)$')"
testdata="$(printf '%s\n' "$files" | grep '/testdata/')" testdata="$(printf '%s\n' "$files" | grep '/testdata/')"
gomod="$(printf '%s\n' "$files" | grep '/go\.\(mod\|sum\|work\)$')" gomod="$(printf '%s\n' "$files" | grep '/go\.\(mod\|sum\)$')"
for pattern in $GO_INSTALL_EXTRA; do for pattern in $GO_INSTALL_EXTRA; do
extra="$(printf '%s\n' "$extra"; printf '%s\n' "$files" | grep -e "$pattern")" extra="$(printf '%s\n' "$extra"; printf '%s\n' "$files" | grep -e "$pattern")"

4
lang/golang/golang-package.mk
View File

@ -32,7 +32,7 @@ include $(GO_INCLUDE_DIR)/golang-values.mk
# #
# * Files in any 'testdata' directory # * Files in any 'testdata' directory
# #
# * go.mod, go.sum and go.work, in any directory # * go.mod and go.sum, in any directory
# #
# e.g. GO_PKG_INSTALL_EXTRA:=example.toml marshal_test.toml # e.g. GO_PKG_INSTALL_EXTRA:=example.toml marshal_test.toml
# #
@ -198,11 +198,9 @@ GO_PKG_TARGET_VARS= \
GOOS="$(GO_OS)" \ GOOS="$(GO_OS)" \
GOARCH="$(GO_ARCH)" \ GOARCH="$(GO_ARCH)" \
GO386="$(GO_386)" \ GO386="$(GO_386)" \
GOAMD64="$(GO_AMD64)" \
GOARM="$(GO_ARM)" \ GOARM="$(GO_ARM)" \
GOMIPS="$(GO_MIPS)" \ GOMIPS="$(GO_MIPS)" \
GOMIPS64="$(GO_MIPS64)" \ GOMIPS64="$(GO_MIPS64)" \
GOPPC64="$(GO_PPC64)" \
CGO_ENABLED=1 \ CGO_ENABLED=1 \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
CXX="$(TARGET_CXX)" \ CXX="$(TARGET_CXX)" \

28
lang/golang/golang-values.mk
View File

@ -29,8 +29,7 @@ unexport \
GOOS \ GOOS \
GOPATH \ GOPATH \
GOROOT \ GOROOT \
GOTMPDIR \ GOTMPDIR
GOWORK
# Unmodified: # Unmodified:
# GOINSECURE # GOINSECURE
# GOPRIVATE # GOPRIVATE
@ -59,10 +58,8 @@ unexport \
unexport \ unexport \
GOARM \ GOARM \
GO386 \ GO386 \
GOAMD64 \
GOMIPS \ GOMIPS \
GOMIPS64 \ GOMIPS64 \
GOPPC64 \
GOWASM GOWASM
# Special-purpose environment variables: # Special-purpose environment variables:
@ -89,12 +86,13 @@ unexport \
# CC_FOR_${GOOS}_${GOARCH} # CC_FOR_${GOOS}_${GOARCH}
# CXX_FOR_${GOOS}_${GOARCH} # CXX_FOR_${GOOS}_${GOARCH}
# From https://go.dev/doc/install/source#environment # From https://golang.org/doc/install/source#environment
unexport \ unexport \
GOHOSTOS \ GOHOSTOS \
GOHOSTARCH GOHOSTARCH \
GOPPC64
# From https://go.dev/src/make.bash # From https://golang.org/src/make.bash
unexport \ unexport \
GO_GCFLAGS \ GO_GCFLAGS \
GO_LDFLAGS \ GO_LDFLAGS \
@ -103,16 +101,16 @@ unexport \
GOBUILDTIMELOGFILE \ GOBUILDTIMELOGFILE \
GOROOT_BOOTSTRAP GOROOT_BOOTSTRAP
# From https://go.dev/doc/go1.9#parallel-compile # From https://golang.org/doc/go1.9#parallel-compile
unexport \ unexport \
GO19CONCURRENTCOMPILATION GO19CONCURRENTCOMPILATION
# From https://go.dev/src/cmd/dist/build.go # From https://golang.org/src/cmd/dist/build.go
unexport \ unexport \
BOOT_GO_GCFLAGS \ BOOT_GO_GCFLAGS \
BOOT_GO_LDFLAGS BOOT_GO_LDFLAGS
# From https://go.dev/src/cmd/dist/buildtool.go # From https://golang.org/src/cmd/dist/buildtool.go
unexport \ unexport \
GOBOOTSTRAP_TOOLEXEC GOBOOTSTRAP_TOOLEXEC
@ -154,9 +152,6 @@ ifeq ($(GO_ARCH),386)
# -fno-plt: causes "unexpected GOT reloc for non-dynamic symbol" errors # -fno-plt: causes "unexpected GOT reloc for non-dynamic symbol" errors
GO_CFLAGS_TO_REMOVE:=-fno-plt GO_CFLAGS_TO_REMOVE:=-fno-plt
else ifeq ($(GO_ARCH),amd64)
GO_AMD64:=v1
else ifeq ($(GO_ARCH),arm) else ifeq ($(GO_ARCH),arm)
GO_TARGET_FPU:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) GO_TARGET_FPU:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
@ -188,9 +183,6 @@ else ifneq ($(filter $(GO_ARCH),mips64 mips64le),)
GO_MIPS64:=softfloat GO_MIPS64:=softfloat
endif endif
else ifeq ($(GO_ARCH),ppc64)
GO_PPC64:=power8
endif endif
@ -201,7 +193,7 @@ GO_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mips64||mips64el||mipsel||pow
# ASLR/PIE # ASLR/PIE
# From https://go.dev/src/cmd/internal/sys/supported.go # From https://golang.org/src/cmd/internal/sys/supported.go
GO_PIE_SUPPORTED_OS_ARCH:= \ GO_PIE_SUPPORTED_OS_ARCH:= \
android_386 android_amd64 android_arm android_arm64 \ android_386 android_amd64 android_arm android_arm64 \
linux_386 linux_amd64 linux_arm linux_arm64 \ linux_386 linux_amd64 linux_arm linux_arm64 \
@ -217,7 +209,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \
\ \
linux_ppc64le linux_riscv64 linux_s390x linux_ppc64le linux_riscv64 linux_s390x
# From https://go.dev/src/cmd/go/internal/work/init.go # From https://golang.org/src/cmd/go/internal/work/init.go
go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm),,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)),) ifneq ($(filter $(GO_HOST_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),)

9
lang/golang/golang/Makefile
View File

@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
GO_VERSION_MAJOR_MINOR:=1.18 GO_VERSION_MAJOR_MINOR:=1.17
GO_VERSION_PATCH:= GO_VERSION_PATCH:=8
PKG_NAME:=golang PKG_NAME:=golang
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) 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:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=$(GO_SOURCE_URLS) PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
PKG_HASH:=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 PKG_HASH:=2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
@ -262,11 +262,10 @@ $(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$(
PKG_GO_ZBOOTSTRAP_MODS:= \ PKG_GO_ZBOOTSTRAP_MODS:= \
s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \ 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),5)`/; \
s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \ s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \
s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \ s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \
s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/; s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `power8`/;
PKG_GO_ZBOOTSTRAP_PATH:=$(PKG_BUILD_DIR)/src/internal/buildcfg/zbootstrap.go PKG_GO_ZBOOTSTRAP_PATH:=$(PKG_BUILD_DIR)/src/internal/buildcfg/zbootstrap.go

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

@ -1,19 +1,8 @@
From 5ccf9f47bf4f5ba53e0ab7338a7fd4626714cfb2 Mon Sep 17 00:00:00 2001 This is https://github.com/golang/go/pull/49748 backported for Go 1.17.
From: Jeffery To <jeffery.to@gmail.com>
Date: Tue, 23 Nov 2021 15:05:37 +0800
Subject: [PATCH] cmd/link: use gold on ARM/ARM64 only if gold is available
COPY relocation handling on ARM/ARM64 has been fixed in recent versions
of the GNU linker. This switches to gold only if gold is available.
Fixes #22040.
---
src/cmd/link/internal/ld/lib.go | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
--- a/src/cmd/link/internal/ld/lib.go --- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go
@@ -1393,25 +1393,20 @@ func (ctxt *Link) hostlink() { @@ -1391,23 +1391,18 @@ func (ctxt *Link) hostlink() {
} }
if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) && buildcfg.GOOS == "linux" { if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) && buildcfg.GOOS == "linux" {
@ -35,9 +24,7 @@ Fixes #22040.
- // back to ld.bfd. So we parse the version information - // back to ld.bfd. So we parse the version information
- // and provide a useful error if gold is missing. - // and provide a useful error if gold is missing.
+ // In both cases, switch to gold if gold is available. + // In both cases, switch to gold if gold is available.
name, args := flagExtld[0], flagExtld[1:] cmd := exec.Command(*flagExtld, "-fuse-ld=gold", "-Wl,--version")
args = append(args, "-fuse-ld=gold", "-Wl,--version")
cmd := exec.Command(name, args...)
if out, err := cmd.CombinedOutput(); err == nil { if out, err := cmd.CombinedOutput(); err == nil {
- if !bytes.Contains(out, []byte("GNU gold")) { - if !bytes.Contains(out, []byte("GNU gold")) {
- log.Fatalf("ARM external linker must be gold (issue #15696), but is not: %s", out) - log.Fatalf("ARM external linker must be gold (issue #15696), but is not: %s", out)