openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

golang: Optimized values to suit golang 1.23

Browse Source 
Added GOARM64 and GORISCV64 in golang-build.sh.
Drop deprecated GOROOT_FINAL in GoCompiler/Default/Make.
Updated environment vars in golang-values.mk for GOARM64 and GORISCV64.
Refined host build in golang/Makefile for openbsd_riscv64.

Co-authored-by: Tianling Shen <cnsztl@immortalwrt.org>
Signed-off-by: Milinda Brantini <C_A_T_T_E_R_Y@outlook.com>
This commit is contained in:
Milinda Brantini
2024-09-29 23:36:35 +08:00
committed by Tianling Shen
parent bfb9e266dc
commit ae0d0879f5
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ build() {
if [ "$GO_GO_GENERATE" = 1 ]; then if [ "$GO_GO_GENERATE" = 1 ]; then
log "Calling go generate" log "Calling go generate"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
GOOS='' GOARCH='' GO386='' GOARM='' GOMIPS='' GOMIPS64='' \ GOOS='' GOARCH='' GO386='' GOARM='' GOARM64='' GOMIPS='' GOMIPS64='' GORISCV64=''\
go generate -v $targets go generate -v $targets
log log
fi fi

9
lang/golang/golang-compiler.mk
View File

@@ -19,14 +19,11 @@ define GoCompiler/Default/CheckHost
endef endef
# $(1) source go root # $(1) source go root
# $(2) destination prefix # $(2) additional environment variables (optional)
# $(3) go version id
# $(4) additional environment variables (optional)
define GoCompiler/Default/Make define GoCompiler/Default/Make
( \ ( \
cd "$(1)/src" ; \ cd "$(1)/src" ; \
$(if $(2),GOROOT_FINAL="$(2)/lib/go-$(3)") \ $(2) \
$(4) \
$(BASH) make.bash \ $(BASH) make.bash \
$(if $(findstring s,$(OPENWRT_VERBOSE)),-v) \ $(if $(findstring s,$(OPENWRT_VERBOSE)),-v) \
--no-banner \ --no-banner \
@@ -156,7 +153,7 @@ define GoCompiler/AddProfile
# $$(1) additional environment variables (optional) # $$(1) additional environment variables (optional)
define GoCompiler/$(1)/Make define GoCompiler/$(1)/Make
$$(call GoCompiler/Default/Make,$(2),$(3),$(4),$$(1)) $$(call GoCompiler/Default/Make,$(2),$$(1))
endef endef
# $$(1) override install prefix (optional) # $$(1) override install prefix (optional)

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

@@ -59,11 +59,13 @@ unexport \
# Architecture-specific environment variables: # Architecture-specific environment variables:
unexport \ unexport \
GOARM \ GOARM \
GOARM64 \
GO386 \ GO386 \
GOAMD64 \ GOAMD64 \
GOMIPS \ GOMIPS \
GOMIPS64 \ GOMIPS64 \
GOPPC64 \ GOPPC64 \
GORISCV64 \
GOWASM GOWASM
# Environment variables for use with code coverage: # Environment variables for use with code coverage:

3
lang/golang/golang/Makefile
View File

@@ -34,7 +34,6 @@ PKG_BUILD_FLAGS:=no-mips16
PKG_GO_PREFIX:=/usr PKG_GO_PREFIX:=/usr
PKG_GO_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR) 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_DIR:=$(BUILD_DIR_HOST)/go-$(PKG_VERSION)
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
@@ -65,6 +64,7 @@ HOST_GO_VALID_OS_ARCH:= \
wasip1_wasm \ wasip1_wasm \
\ \
freebsd_riscv64 \ freebsd_riscv64 \
openbsd_riscv64 \
\ \
linux_ppc64 linux_ppc64le \ linux_ppc64 linux_ppc64le \
linux_mips linux_mipsle linux_mips64 linux_mips64le \ linux_mips linux_mipsle linux_mips64 linux_mips64le \
@@ -394,7 +394,6 @@ define Build/Compile
cd "$(PKG_BUILD_DIR)/bin" ; \ cd "$(PKG_BUILD_DIR)/bin" ; \
export $(GO_PKG_TARGET_VARS) ; \ export $(GO_PKG_TARGET_VARS) ; \
$(CP) go go-host ; \ $(CP) go go-host ; \
GOROOT_FINAL="$(PKG_GO_ROOT)" \
GO_GCC_HELPER_CC="$(TARGET_CC)" \ GO_GCC_HELPER_CC="$(TARGET_CC)" \
GO_GCC_HELPER_CXX="$(TARGET_CXX)" \ GO_GCC_HELPER_CXX="$(TARGET_CXX)" \
$(PKG_GO_VARS) \ $(PKG_GO_VARS) \