Skip to content

Commit dcd8f4a

Browse files
committed
bump(main/golang): 1.26.3
1 parent e662d2e commit dcd8f4a

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

packages/golang/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ 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.26.2"
5+
TERMUX_PKG_VERSION="3:1.26.3"
66
TERMUX_PKG_SRCURL=https://go.dev/dl/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
7-
TERMUX_PKG_SHA256=2e91ebb6947a96e9436fb2b3926a8802efe63a6d375dffec4f82aa9dbd6fd43b
7+
TERMUX_PKG_SHA256=1c646875d0aa8799133184ed57cf79ff24bdefe8c8820470602a9d3d6d9192b8
88
TERMUX_PKG_DEPENDS="clang"
99
TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
1010
TERMUX_PKG_RECOMMENDS="resolv-conf"
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
--- a/src/runtime/os_linux32.go
22
+++ b/src/runtime/os_linux32.go
3-
@@ -21,7 +21,7 @@
4-
3+
@@ -24,7 +24,7 @@
4+
55
//go:nosplit
66
func futex(addr unsafe.Pointer, op int32, val uint32, ts *timespec, addr2 unsafe.Pointer, val3 uint32) int32 {
7-
- if !isFutexTime32bitOnly.Load() {
8-
+ if GOOS != "android" && !isFutexTime32bitOnly.Load() {
9-
ret := futex_time64(addr, op, val, ts, addr2, val3)
10-
// futex_time64 is only supported on Linux 5.0+
11-
if ret != -_ENOSYS {
12-
@@ -49,7 +49,7 @@
13-
7+
- if use64bitsTimeOn32bits {
8+
+ if GOOS != "android" && use64bitsTimeOn32bits {
9+
return futex_time64(addr, op, val, ts, addr2, val3)
10+
}
11+
// Downgrade ts.
12+
@@ -45,7 +45,7 @@
13+
1414
//go:nosplit
1515
func timer_settime(timerid int32, flags int32, new, old *itimerspec) int32 {
16-
- if !isSetTime32bitOnly.Load() {
17-
+ if GOOS != "android" && !isSetTime32bitOnly.Load() {
18-
ret := timer_settime64(timerid, flags, new, old)
19-
// timer_settime64 is only supported on Linux 5.0+
20-
if ret != -_ENOSYS {
16+
- if use64bitsTimeOn32bits {
17+
+ if GOOS != "android" && use64bitsTimeOn32bits {
18+
return timer_settime64(timerid, flags, new, old)
19+
}
20+

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.26.2
7-
local TERMUX_GO_SHA256=990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282
6+
local TERMUX_GO_VERSION=go1.26.3
7+
local TERMUX_GO_SHA256=2b2cfc7148493da5e73981bffbf3353af381d5f93e789c82c79aff64962eb556
88
local TERMUX_GO_PLATFORM=linux-amd64
99

1010
local TERMUX_BUILDGO_FOLDER

0 commit comments

Comments
 (0)