Skip to content

Commit 25f37f9

Browse files
committed
golang: update to 1.24.1
Fixes: coolsnowwolf/lede#13377
1 parent db36de0 commit 25f37f9

File tree

1 file changed

+34
-4
lines changed

1 file changed

+34
-4
lines changed

lang/golang/golang/Makefile

Lines changed: 34 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.23
11-
GO_VERSION_PATCH:=6
10+
GO_VERSION_MAJOR_MINOR:=1.24
11+
GO_VERSION_PATCH:=1
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:=039c5b04e65279daceee8a6f71e70bd05cf5b801782b6f77c6e19e2ed0511222
23+
PKG_HASH:=8244ebf46c65607db10222b5806aeb31c1fcf8979c1b6b12f60c677e9a3c0656
2424

2525
PKG_MAINTAINER:=Jeffery To <[email protected]>
2626
PKG_LICENSE:=BSD-3-Clause
@@ -102,6 +102,12 @@ BOOTSTRAP_1_20_HASH:=1aef321a0e3e38b7e91d2d7eb64040666cabdcc77d383de3c9522d0d69b
102102

103103
BOOTSTRAP_1_20_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.20
104104

105+
BOOTSTRAP_1_22_SOURCE:=go1.22.6.src.tar.gz
106+
BOOTSTRAP_1_22_SOURCE_URL:=$(GO_SOURCE_URLS)
107+
BOOTSTRAP_1_22_HASH:=9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51
108+
109+
BOOTSTRAP_1_22_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.22
110+
105111
include $(INCLUDE_DIR)/host-build.mk
106112
include $(INCLUDE_DIR)/package.mk
107113
include ../golang-compiler.mk
@@ -112,6 +118,7 @@ HOST_UNPACK:=$(HOST_TAR) -C "$(HOST_BUILD_DIR)" --strip-components=1 -xzf "$(DL_
112118
BOOTSTRAP_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_SOURCE)"
113119
BOOTSTRAP_1_17_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_17_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_17_SOURCE)"
114120
BOOTSTRAP_1_20_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_20_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_20_SOURCE)"
121+
BOOTSTRAP_1_22_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_22_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_22_SOURCE)"
115122

116123
# don't strip ELF executables in test data
117124
RSTRIP:=:
@@ -174,6 +181,7 @@ endef
174181
define Package/golang-src
175182
$(call Package/golang/Default)
176183
TITLE+= (source files)
184+
DEPENDS+= +libstdcpp +libtiff
177185
endef
178186

179187
define Package/golang-src/description
@@ -240,6 +248,23 @@ Hooks/HostPrepare/Post+=Bootstrap-1.20/Prepare
240248

241249
$(eval $(call GoCompiler/AddProfile,Bootstrap-1.20,$(BOOTSTRAP_1_20_BUILD_DIR),,bootstrap-1.20,$(GO_HOST_OS_ARCH)))
242250

251+
252+
# Bootstrap 1.22
253+
254+
define Download/golang-bootstrap-1.22
255+
FILE:=$(BOOTSTRAP_1_22_SOURCE)
256+
URL:=$(BOOTSTRAP_1_22_SOURCE_URL)
257+
HASH:=$(BOOTSTRAP_1_22_HASH)
258+
endef
259+
$(eval $(call Download,golang-bootstrap-1.22))
260+
261+
define Bootstrap-1.22/Prepare
262+
mkdir -p "$(BOOTSTRAP_1_22_BUILD_DIR)" && $(BOOTSTRAP_1_22_UNPACK) ;
263+
endef
264+
Hooks/HostPrepare/Post+=Bootstrap-1.22/Prepare
265+
266+
$(eval $(call GoCompiler/AddProfile,Bootstrap-1.22,$(BOOTSTRAP_1_22_BUILD_DIR),,bootstrap-1.22,$(GO_HOST_OS_ARCH)))
267+
243268
# Host
244269

245270
ifeq ($(GO_HOST_PIE_SUPPORTED),1)
@@ -280,8 +305,13 @@ define Host/Compile
280305
$(HOST_GO_VARS) \
281306
)
282307

283-
$(call GoCompiler/Host/Make, \
308+
$(call GoCompiler/Bootstrap-1.22/Make, \
284309
GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_20_BUILD_DIR)" \
310+
$(HOST_GO_VARS) \
311+
)
312+
313+
$(call GoCompiler/Host/Make, \
314+
GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_22_BUILD_DIR)" \
285315
$(if $(HOST_GO_ENABLE_PIE),GO_LDFLAGS="-buildmode pie") \
286316
$(HOST_GO_VARS) \
287317
)

0 commit comments

Comments
 (0)