Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgpkg(main/golang): 1.23.0 #21159

Merged
merged 1 commit into from
Aug 18, 2024
Merged

upgpkg(main/golang): 1.23.0 #21159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions packages/golang/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/
TERMUX_PKG_DESCRIPTION="Go programming language compiler"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
_MAJOR_VERSION=1.22
_MAJOR_VERSION=1.23
# Use the ~ deb versioning construct in the future:
TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.5
TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.0
TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
TERMUX_PKG_SHA256=ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6
TERMUX_PKG_SHA256=42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6
TERMUX_PKG_DEPENDS="clang"
TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
TERMUX_PKG_RECOMMENDS="resolv-conf"
Expand Down Expand Up @@ -44,6 +44,7 @@ termux_step_make_install() {
cp bin/$TERMUX_GOLANG_DIRNAME/{go,gofmt} $TERMUX_GODIR/bin/
ln -sfr $TERMUX_GODIR/bin/go $TERMUX_PREFIX/bin/go
ln -sfr $TERMUX_GODIR/bin/gofmt $TERMUX_PREFIX/bin/gofmt
cp go.env $TERMUX_GODIR/
cp VERSION $TERMUX_GODIR/
cp pkg/tool/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/
cp -Rf src/* $TERMUX_GODIR/src/
Expand Down
16 changes: 0 additions & 16 deletions packages/golang/fix-GOPROXY-and-GOSUMDB-default-is-empty.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions scripts/build/setup/termux_setup_golang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Utility function for golang-using packages to setup a go toolchain.
termux_setup_golang() {
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
local TERMUX_GO_VERSION=go1.22.5
local TERMUX_GO_SHA256=904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0
local TERMUX_GO_VERSION=go1.23.0
local TERMUX_GO_SHA256=905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3
if [ "$TERMUX_PKG_GO_USE_OLDER" = "true" ]; then
TERMUX_GO_VERSION=go1.21.12
TERMUX_GO_SHA256=121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5
TERMUX_GO_VERSION=go1.22.6
TERMUX_GO_SHA256=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616
fi
local TERMUX_GO_PLATFORM=linux-amd64

Expand Down