Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

upgpkg(main/golang): 1.22.1

This commit is contained in:
Arun 2024-02-18 23:24:34 +05:30 committed by Kevin Williams
parent 8a9c0ea92b
commit fca5f01b6c
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/golang/build.sh
View File

@ -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.21
_MAJOR_VERSION=1.22
# Use the ~ deb versioning construct in the future:
TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.6
TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}.1
TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${TERMUX_PKG_VERSION#*:}.src.tar.gz
TERMUX_PKG_SHA256=124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248
TERMUX_PKG_SHA256=79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321
TERMUX_PKG_DEPENDS="clang"
TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
TERMUX_PKG_RECOMMENDS="resolv-conf"

62
packages/golang/fix-hardcoded-etc-resolv-conf.diff
View File

@ -1,26 +1,26 @@
--- a/src/net/conf.go
+++ b/src/net/conf.go
@@ -2,7 +2,7 @@
--- a/src/net/conf.go 2024-02-02 23:39:55.000000000 +0530
+++ b/src/net/conf.go 2024-02-18 22:34:10.016000996 +0530
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build !js
+//go:build !js && !android
+//go:build !android
+
package net
--- a/src/net/conf_android.go
+++ b/src/net/conf_android.go
@@ -2,7 +2,7 @@
import (
--- a/src/net/conf_android.go 2024-02-18 22:31:59.680000988 +0530
+++ b/src/net/conf_android.go 2024-02-18 22:41:52.060001024 +0530
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build !js
+//go:build android
+
package net
@@ -408,7 +408,7 @@
import (
@@ -414,7 +416,7 @@
var haveMDNSAllow bool
switch c.mdnsTest {
case mdnsFromSystem:
@ -29,29 +29,29 @@
if err != nil && !errors.Is(err, fs.ErrNotExist) {
// Let libc figure out what is going on.
return hostLookupCgo, dnsConf
--- a/src/net/dnsclient_unix.go
+++ b/src/net/dnsclient_unix.go
@@ -2,7 +2,7 @@
--- a/src/net/dnsclient_unix.go 2024-02-02 23:39:55.000000000 +0530
+++ b/src/net/dnsclient_unix.go 2024-02-18 22:36:17.948001004 +0530
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build !js
+//go:build !js && !android
+//go:build !android
+
// DNS client: see RFC 1035.
// Has to be linked into package net for Dial.
--- a/src/net/dnsclient_android.go
+++ b/src/net/dnsclient_android.go
@@ -2,7 +2,7 @@
--- a/src/net/dnsclient_android.go 2024-02-18 22:32:31.136000990 +0530
+++ b/src/net/dnsclient_android.go 2024-02-18 22:43:13.612001028 +0530
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build !js
+//go:build android
+
// DNS client: see RFC 1035.
// Has to be linked into package net for Dial.
@@ -349,7 +349,7 @@
@@ -367,7 +369,7 @@
var resolvConf resolverConfig
func getSystemDNSConfig() *dnsConfig {
@ -60,7 +60,7 @@
return resolvConf.dnsConfig.Load()
}
@@ -357,7 +357,7 @@
@@ -375,7 +377,7 @@
func (conf *resolverConfig) init() {
// Set dnsConfig and lastChecked so we don't parse
// resolv.conf twice the first time.

8
scripts/build/setup/termux_setup_golang.sh
View File

@ -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.21.6
local TERMUX_GO_SHA256=3f934f40ac360b9c01f616a9aa1796d227d8b0328bf64cb045c7b8c4ee9caea4
local TERMUX_GO_VERSION=go1.22.1
local TERMUX_GO_SHA256=aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f
if [ "$TERMUX_PKG_GO_USE_OLDER" = "true" ]; then
TERMUX_GO_VERSION=go1.20.13
TERMUX_GO_SHA256=9a9d3dcae2b6a638b1f2e9bd4db08ffb39c10e55d9696914002742d90f0047b5
TERMUX_GO_VERSION=go1.21.8
TERMUX_GO_SHA256=538b3b143dc7f32b093c8ffe0e050c260b57fc9d57a12c4140a639a8dd2b4e4f
fi
local TERMUX_GO_PLATFORM=linux-amd64