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
4 changes: 2 additions & 2 deletions packages/golang/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://go.dev/
TERMUX_PKG_DESCRIPTION="Go programming language compiler"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:1.26.2"
TERMUX_PKG_VERSION="3:1.26.3"
TERMUX_PKG_SRCURL=https://go.dev/dl/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
TERMUX_PKG_SHA256=2e91ebb6947a96e9436fb2b3926a8802efe63a6d375dffec4f82aa9dbd6fd43b
TERMUX_PKG_SHA256=1c646875d0aa8799133184ed57cf79ff24bdefe8c8820470602a9d3d6d9192b8
TERMUX_PKG_DEPENDS="clang"
TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
TERMUX_PKG_RECOMMENDS="resolv-conf"
Expand Down
28 changes: 14 additions & 14 deletions packages/golang/patch-script/remove-futex_time64.diff
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
--- a/src/runtime/os_linux32.go
+++ b/src/runtime/os_linux32.go
@@ -21,7 +21,7 @@
@@ -24,7 +24,7 @@

//go:nosplit
func futex(addr unsafe.Pointer, op int32, val uint32, ts *timespec, addr2 unsafe.Pointer, val3 uint32) int32 {
- if !isFutexTime32bitOnly.Load() {
+ if GOOS != "android" && !isFutexTime32bitOnly.Load() {
ret := futex_time64(addr, op, val, ts, addr2, val3)
// futex_time64 is only supported on Linux 5.0+
if ret != -_ENOSYS {
@@ -49,7 +49,7 @@
- if use64bitsTimeOn32bits {
+ if GOOS != "android" && use64bitsTimeOn32bits {
return futex_time64(addr, op, val, ts, addr2, val3)
}
// Downgrade ts.
@@ -45,7 +45,7 @@

//go:nosplit
func timer_settime(timerid int32, flags int32, new, old *itimerspec) int32 {
- if !isSetTime32bitOnly.Load() {
+ if GOOS != "android" && !isSetTime32bitOnly.Load() {
ret := timer_settime64(timerid, flags, new, old)
// timer_settime64 is only supported on Linux 5.0+
if ret != -_ENOSYS {
- if use64bitsTimeOn32bits {
+ if GOOS != "android" && use64bitsTimeOn32bits {
return timer_settime64(timerid, flags, new, old)
}

4 changes: 2 additions & 2 deletions scripts/build/setup/termux_setup_golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ termux_setup_golang() {
export GOPATH="${TERMUX_COMMON_CACHEDIR}/go-path" GOCACHE="${TERMUX_COMMON_CACHEDIR}/go-build"
mkdir -p "$GOPATH" "$GOCACHE"
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
local TERMUX_GO_VERSION=go1.26.2
local TERMUX_GO_SHA256=990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282
local TERMUX_GO_VERSION=go1.26.3
local TERMUX_GO_SHA256=2b2cfc7148493da5e73981bffbf3353af381d5f93e789c82c79aff64962eb556
local TERMUX_GO_PLATFORM=linux-amd64

local TERMUX_BUILDGO_FOLDER
Expand Down
Loading