From 0dde477f486239b7f0468099c9143dcc9617b81e Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sat, 13 Dec 2025 23:32:36 +0100 Subject: [PATCH] Update go bootstrap --- go/build.sh | 6 ++++-- go/build_bootstrap.sh | 1 + go/download.sh | 4 +++- go/download.sha256 | 3 ++- go/install_gentoo.txt | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/go/build.sh b/go/build.sh index 1fee508..5c23e2c 100755 --- a/go/build.sh +++ b/go/build.sh @@ -3,11 +3,13 @@ set -eu export MAKEFLAGS="-j${NPROC:-$(nproc)}" -version_go=1.23.0 # https://golang.org/dl/ +version_go=1.25.0 # https://golang.org/dl/ +version_go23=1.23.12 version_go21=1.21.13 version_go19=1.19.13 [ ! -d build/install-go1.4 ] && ./build_bootstrap.sh [ ! -d build/install-go1.19 ] && ./build_go.sh 1.4 1.19 "$version_go19" [ ! -d build/install-go1.21 ] && ./build_go.sh 1.19 1.21 "$version_go21" -[ ! -d build/install-go ] && ./build_go.sh 1.21 '' "$version_go" +[ ! -d build/install-go1.23 ] && ./build_go.sh 1.21 1.23 "$version_go23" +[ ! -d build/install-go ] && ./build_go.sh 1.23 '' "$version_go" diff --git a/go/build_bootstrap.sh b/go/build_bootstrap.sh index 30f97d5..e28a372 100755 --- a/go/build_bootstrap.sh +++ b/go/build_bootstrap.sh @@ -13,6 +13,7 @@ tar xf "$dir_download/go1.4-bootstrap-$version_bootstrap.tar.gz" -C "go1.4-boots cd "go1.4-bootstrap-$version_bootstrap" # Build and install +export CC="${CC:-gcc} -std=gnu17" (cd src; ./make.bash) find src -type f \( ! -name '*.go' \ diff --git a/go/download.sh b/go/download.sh index 045f35a..5f2d29b 100755 --- a/go/download.sh +++ b/go/download.sh @@ -1,7 +1,8 @@ #!/bin/sh set -eu -version_go=1.23.0 # https://golang.org/dl/ +version_go=1.25.0 # https://golang.org/dl/ +version_go23=1.23.12 version_go21=1.21.13 version_go19=1.19.13 version_bootstrap=20171003 # https://golang.org/doc/install/source#go14 @@ -10,6 +11,7 @@ mkdir -p download cd download wget -c "https://dl.google.com/go/go$version_go.src.tar.gz" +wget -c "https://dl.google.com/go/go$version_go23.src.tar.gz" wget -c "https://dl.google.com/go/go$version_go21.src.tar.gz" wget -c "https://dl.google.com/go/go$version_go19.src.tar.gz" wget -c "https://dl.google.com/go/go1.4-bootstrap-$version_bootstrap.tar.gz" diff --git a/go/download.sha256 b/go/download.sha256 index 21e3d6a..93c1f44 100644 --- a/go/download.sha256 +++ b/go/download.sha256 @@ -1,4 +1,5 @@ ccf36b53fb0024a017353c3ddb22c1f00bc7a8073c6aac79042da24ee34434d3 go1.19.13.src.tar.gz 71fb31606a1de48d129d591e8717a63e0c5565ffba09a24ea9f899a13214c34d go1.21.13.src.tar.gz -42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 go1.23.0.src.tar.gz +e1cce9379a24e895714a412c7ddd157d2614d9edbe83a84449b6e1840b4f1226 go1.23.12.src.tar.gz +4bd01e91297207bfa450ea40d4d5a93b1b531a5e438473b2a06e18e077227225 go1.25.0.src.tar.gz f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52 go1.4-bootstrap-20171003.tar.gz diff --git a/go/install_gentoo.txt b/go/install_gentoo.txt index 717b721..2f05890 100644 --- a/go/install_gentoo.txt +++ b/go/install_gentoo.txt @@ -1,5 +1,5 @@ # Update with GO_BOOTSTRAP_MIN version in dev-lang/go -GO_BOOTSTRAP_MIN=1.20.14 +GO_BOOTSTRAP_MIN=1.22.12 sudo rsync -rvP build/install-go/ /usr/lib/go-bootstrap sudo mkdir -p /var/db/pkg/dev-lang/go-bootstrap-$GO_BOOTSTRAP_MIN