Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 34 additions & 5 deletions lang/golang/golang-bootstrap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

include $(TOPDIR)/rules.mk

GO_VERSION_MAJOR_MINOR:=1.22
GO_VERSION_PATCH:=12
PKG_HASH:=012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71
GO_VERSION_MAJOR_MINOR:=1.24
GO_VERSION_PATCH:=13
PKG_HASH:=639a6204c2486b137df1eb6e78ee3ed038f9877d0e4b5a465e796a2153f858d7

PKG_NAME:=golang-bootstrap
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
Expand Down Expand Up @@ -78,14 +78,14 @@ HOST_GO_VALID_OS_ARCH:= \
openbsd/arm \
openbsd/arm64 \
openbsd/ppc64 \
openbsd/riscv64 \
plan9/386 \
plan9/amd64 \
plan9/arm \
solaris/amd64 \
wasip1/wasm \
windows/386 \
windows/amd64 \
windows/arm \
windows/arm64

BOOTSTRAP_SOURCE:=go1.4-bootstrap-20171003.tar.gz
Expand Down Expand Up @@ -128,6 +128,12 @@ BOOTSTRAP_1_20_HASH:=1aef321a0e3e38b7e91d2d7eb64040666cabdcc77d383de3c9522d0d69b

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

BOOTSTRAP_1_22_SOURCE:=go1.22.12.src.tar.gz
BOOTSTRAP_1_22_SOURCE_URL:=$(GO_SOURCE_URLS)
BOOTSTRAP_1_22_HASH:=012a7e1f37f362c0918c1dfa3334458ac2da1628c4b9cf4d9ca02db986e17d71

BOOTSTRAP_1_22_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.22

include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include ../golang-compiler.mk
Expand All @@ -138,6 +144,7 @@ HOST_UNPACK:=$(HOST_TAR) -C "$(HOST_BUILD_DIR)" --strip-components=1 -xzf "$(DL_
BOOTSTRAP_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_SOURCE)"
BOOTSTRAP_1_17_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_17_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_17_SOURCE)"
BOOTSTRAP_1_20_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_20_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_20_SOURCE)"
BOOTSTRAP_1_22_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_22_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_22_SOURCE)"

# Don't strip ELF executables in test data
RSTRIP:=:
Expand Down Expand Up @@ -224,8 +231,25 @@ Hooks/HostPrepare/Post+=Bootstrap-1.20/Prepare

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

# Bootstrap 1.22

define Download/golang-bootstrap-1.22
FILE:=$(BOOTSTRAP_1_22_SOURCE)
URL:=$(BOOTSTRAP_1_22_SOURCE_URL)
HASH:=$(BOOTSTRAP_1_22_HASH)
endef
$(eval $(call Download,golang-bootstrap-1.22))

define Bootstrap-1.22/Prepare
mkdir -p "$(BOOTSTRAP_1_22_BUILD_DIR)" && $(BOOTSTRAP_1_22_UNPACK) ;
endef
Hooks/HostPrepare/Post+=Bootstrap-1.22/Prepare

$(eval $(call GoCompiler/AddProfile,Bootstrap-1.22,$(BOOTSTRAP_1_22_BUILD_DIR),,bootstrap-1.22,$(GO_HOST_OS_ARCH)))

endif


# Host

ifeq ($(GO_HOST_PIE_SUPPORTED),1)
Expand Down Expand Up @@ -269,8 +293,13 @@ define Host/Compile
$(HOST_GO_VARS) \
)

$(call GoCompiler/Host/Make, \
$(call GoCompiler/Bootstrap-1.22/Make, \
GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_20_BUILD_DIR)" \
$(HOST_GO_VARS) \
)

$(call GoCompiler/Host/Make, \
GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_22_BUILD_DIR)" \
$(if $(HOST_GO_ENABLE_PIE),GO_LDFLAGS="-buildmode pie") \
$(HOST_GO_VARS) \
)
Expand Down
4 changes: 2 additions & 2 deletions lang/golang/golang-values.mk
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ unexport \
GOBOOTSTRAP_TOOLEXEC


GO_DEFAULT_VERSION:=1.25
GO_DEFAULT_VERSION:=1.26
GO_HOST_VERSION:=$(patsubst golang%/host,%,$(filter golang%/host,$(PKG_BUILD_DEPENDS)))
ifeq ($(GO_HOST_VERSION),)
GO_HOST_VERSION:=$(GO_DEFAULT_VERSION)
Expand Down Expand Up @@ -310,7 +310,7 @@ GO_PIE_SUPPORTED_OS_ARCH:= \
windows/arm64

# 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)
go_pie_install_suffix=$(if $(filter $(1),aix/ppc64 windows/386 windows/amd64 windows/arm64),,shared)

ifneq ($(filter $(GO_HOST_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),)
GO_HOST_PIE_SUPPORTED:=1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

include $(TOPDIR)/rules.mk

PKG_NAME:=golang1.25
GO_VERSION_MAJOR_MINOR:=1.25
GO_VERSION_PATCH:=7
PKG_NAME:=golang1.26
GO_VERSION_MAJOR_MINOR:=1.26
GO_VERSION_PATCH:=0
GO_VERSION_RC:=
GO_BOOTSTRAP_VERSION:=bootstrap
PKG_HASH:=178f2832820274b43e177d32f06a3ebb0129e427dd20a5e4c88df2c1763cf10a
PKG_HASH:=c9132a8a1f6bd2aa4aad1d74b8231d95274950483a4950657ee6c56e6e817790

PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_RC),.0)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
PKG_FILE_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_RC),rc$(GO_VERSION_RC))$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
Expand Down Expand Up @@ -57,7 +57,6 @@ HOST_GO_VALID_OS_ARCH:= \
freebsd/amd64 \
freebsd/arm \
freebsd/arm64 \
freebsd/riscv64 \
illumos/amd64 \
ios/amd64 \
ios/arm64 \
Expand All @@ -84,14 +83,14 @@ HOST_GO_VALID_OS_ARCH:= \
openbsd/arm \
openbsd/arm64 \
openbsd/ppc64 \
openbsd/riscv64 \
plan9/386 \
plan9/amd64 \
plan9/arm \
solaris/amd64 \
wasip1/wasm \
windows/386 \
windows/amd64 \
windows/arm \
windows/arm64

include $(INCLUDE_DIR)/host-build.mk
Expand Down
File renamed without changes.
Loading