Skip to content

Commit af4e55e

Browse files
committed
bump(main/golang): 1.25.4
1 parent 9320494 commit af4e55e

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

packages/golang/build.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,59 @@ TERMUX_PKG_HOMEPAGE=https://go.dev/
22
TERMUX_PKG_DESCRIPTION="Go programming language compiler"
33
TERMUX_PKG_LICENSE="BSD 3-Clause"
44
TERMUX_PKG_MAINTAINER="@termux"
5-
TERMUX_PKG_VERSION="3:1.25.3"
5+
TERMUX_PKG_VERSION="3:1.25.4"
66
TERMUX_PKG_SRCURL=https://go.dev/dl/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
7-
TERMUX_PKG_SHA256=a81a4ba593d0015e10c51e267de3ff07c7ac914dfca037d9517d029517097795
7+
TERMUX_PKG_SHA256=160043b7f17b6d60b50369436917fda8d5034640ba39ae2431c6b95a889cc98c
88
TERMUX_PKG_DEPENDS="clang"
99
TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
1010
TERMUX_PKG_RECOMMENDS="resolv-conf"
1111
TERMUX_PKG_BUILD_IN_SRC=true
1212
TERMUX_PKG_NO_STATICSPLIT=true
1313

1414
termux_step_post_get_source() {
15-
. $TERMUX_PKG_BUILDER_DIR/patch-script/fix-hardcoded-etc-resolv-conf.sh
16-
. $TERMUX_PKG_BUILDER_DIR/patch-script/remove-pidfd.sh
15+
. "$TERMUX_PKG_BUILDER_DIR/patch-script/fix-hardcoded-etc-resolv-conf.sh"
16+
. "$TERMUX_PKG_BUILDER_DIR/patch-script/remove-pidfd.sh"
1717
}
1818

1919
termux_step_make_install() {
2020
termux_setup_golang
2121

22-
TERMUX_GOLANG_DIRNAME=${GOOS}_$GOARCH
22+
TERMUX_GOLANG_DIRNAME="${GOOS}_$GOARCH"
2323
TERMUX_GODIR=$TERMUX_PREFIX/lib/go
2424
local LINKER=/system/bin/linker
2525
if (( TERMUX_ARCH_BITS == 64 )); then
2626
LINKER+="64"
2727
fi
2828

2929
(
30-
cd $TERMUX_PKG_SRCDIR/src
30+
cd "$TERMUX_PKG_SRCDIR/src" || termux_error_exit "failed to cd into source directory"
3131
# Unset PKG_CONFIG to avoid the path being hardcoded into src/cmd/cgo/zdefaultcc.go,
3232
# see https://github.com/termux/termux-packages/issues/3505.
33-
env CC_FOR_TARGET=$CC \
34-
CXX_FOR_TARGET=$CXX \
33+
env CC_FOR_TARGET="$CC" \
34+
CXX_FOR_TARGET="$CXX" \
3535
CC=gcc \
3636
GO_LDFLAGS="-extldflags=-pie" \
3737
GO_LDSO="$LINKER" \
38-
GOROOT_BOOTSTRAP=$GOROOT \
39-
GOROOT_FINAL=$TERMUX_GODIR \
38+
GOROOT_BOOTSTRAP="$GOROOT" \
39+
GOROOT_FINAL="$TERMUX_GODIR" \
4040
PKG_CONFIG= \
4141
./make.bash
4242
)
4343

44-
rm -Rf $TERMUX_GODIR
45-
mkdir -p $TERMUX_GODIR/{bin,src,doc,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include}
46-
cp bin/$TERMUX_GOLANG_DIRNAME/{go,gofmt} $TERMUX_GODIR/bin/
47-
ln -sfr $TERMUX_GODIR/bin/go $TERMUX_PREFIX/bin/go
48-
ln -sfr $TERMUX_GODIR/bin/gofmt $TERMUX_PREFIX/bin/gofmt
49-
cp go.env $TERMUX_GODIR/
50-
cp VERSION $TERMUX_GODIR/
51-
cp pkg/tool/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/
52-
cp -Rf src/* $TERMUX_GODIR/src/
53-
cp -Rf doc/* $TERMUX_GODIR/doc/
54-
cp pkg/include/* $TERMUX_GODIR/pkg/include/
55-
cp -Rf lib/* $TERMUX_GODIR/lib
56-
cp -Rf misc/ $TERMUX_GODIR/
44+
rm -Rf "$TERMUX_GODIR"
45+
mkdir -p "$TERMUX_GODIR"/{bin,src,doc,lib,"pkg/tool/$TERMUX_GOLANG_DIRNAME",pkg/include}
46+
cp "bin/$TERMUX_GOLANG_DIRNAME"/{go,gofmt} "$TERMUX_GODIR/bin/"
47+
ln -sfr "$TERMUX_GODIR/bin/go" "$TERMUX_PREFIX/bin/go"
48+
ln -sfr "$TERMUX_GODIR/bin/gofmt" "$TERMUX_PREFIX/bin/gofmt"
49+
cp go.env "$TERMUX_GODIR/"
50+
cp VERSION "$TERMUX_GODIR/"
51+
cp "pkg/tool/$TERMUX_GOLANG_DIRNAME"/* "$TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/"
52+
cp -Rf src/* "$TERMUX_GODIR/src/"
53+
cp -Rf doc/* "$TERMUX_GODIR/doc/"
54+
cp pkg/include/* "$TERMUX_GODIR/pkg/include/"
55+
cp -Rf lib/* "$TERMUX_GODIR/lib"
56+
cp -Rf misc/ "$TERMUX_GODIR/"
5757

5858
# testdata directories are not needed on the installed system
59-
find $TERMUX_GODIR/src -path '*/testdata*' -delete
59+
find "$TERMUX_GODIR/src" -path '*/testdata*' -delete
6060
}

scripts/build/setup/termux_setup_golang.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ termux_setup_golang() {
33
export GOPATH="${TERMUX_COMMON_CACHEDIR}/go-path" GOCACHE="${TERMUX_COMMON_CACHEDIR}/go-build"
44
mkdir -p "$GOPATH" "$GOCACHE"
55
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
6-
local TERMUX_GO_VERSION=go1.25.3
7-
local TERMUX_GO_SHA256=0335f314b6e7bfe08c3d0cfaa7c19db961b7b99fb20be62b0a826c992ad14e0f
6+
local TERMUX_GO_VERSION=go1.25.4
7+
local TERMUX_GO_SHA256=9fa5ffeda4170de60f67f3aa0f824e426421ba724c21e133c1e35d6159ca1bec
88
local TERMUX_GO_PLATFORM=linux-amd64
99

1010
local TERMUX_BUILDGO_FOLDER

0 commit comments

Comments
 (0)