golang: Bump to 1.20
This commit is contained in:
Tee KOBAYASHI
xtkoba
parent
cd14dab942
commit
2aa23df1a2
|
|
@ -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.19.5
|
||||
_MAJOR_VERSION=1.20
|
||||
# Use the ~ deb versioning construct in the future:
|
||||
TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}
|
||||
TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
|
||||
TERMUX_PKG_SHA256=8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f
|
||||
TERMUX_PKG_SHA256=3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33
|
||||
TERMUX_PKG_DEPENDS="clang"
|
||||
TERMUX_PKG_RECOMMENDS="resolv-conf"
|
||||
TERMUX_PKG_NO_STATICSPLIT=true
|
||||
|
|
@ -39,7 +39,7 @@ termux_step_make_install() {
|
|||
|
||||
cd ..
|
||||
rm -Rf $TERMUX_GODIR
|
||||
mkdir -p $TERMUX_GODIR/{bin,src,doc,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}}
|
||||
mkdir -p $TERMUX_GODIR/{bin,src,doc,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include}
|
||||
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
|
||||
|
|
@ -49,7 +49,6 @@ termux_step_make_install() {
|
|||
cp -Rf doc/* $TERMUX_GODIR/doc/
|
||||
cp pkg/include/* $TERMUX_GODIR/pkg/include/
|
||||
cp -Rf lib/* $TERMUX_GODIR/lib
|
||||
cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/
|
||||
cp -Rf misc/ $TERMUX_GODIR/
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,25 +20,10 @@
|
|||
|
||||
package net
|
||||
|
||||
--- a/src/net/conf_android.go
|
||||
+++ b/src/net/conf_android.go
|
||||
@@ -113,10 +113,10 @@ func initConfVal() {
|
||||
@@ -109,7 +109,7 @@
|
||||
return
|
||||
}
|
||||
|
||||
if runtime.GOOS != "openbsd" {
|
||||
- confVal.nss = parseNSSConfFile("/etc/nsswitch.conf")
|
||||
+ confVal.nss = parseNSSConfFile("@TERMUX_PREFIX@/etc/nsswitch.conf")
|
||||
}
|
||||
|
||||
- confVal.resolv = dnsReadConfig("/etc/resolv.conf")
|
||||
+ confVal.resolv = dnsReadConfig("@TERMUX_PREFIX@/etc/resolv.conf")
|
||||
if confVal.resolv.err != nil && !os.IsNotExist(confVal.resolv.err) &&
|
||||
!os.IsPermission(confVal.resolv.err) {
|
||||
// If we can't read the resolv.conf file, assume it
|
||||
@@ -126,7 +126,7 @@ func initConfVal() {
|
||||
confVal.forceCgoLookupHost = true
|
||||
}
|
||||
|
||||
|
||||
- if _, err := os.Stat("/etc/mdns.allow"); err == nil {
|
||||
+ if _, err := os.Stat("@TERMUX_PREFIX@/etc/mdns.allow"); err == nil {
|
||||
confVal.hasMDNSAllow = true
|
||||
|
|
@ -66,32 +51,21 @@
|
|||
|
||||
// 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
|
||||
@@ -355,7 +355,7 @@ func (conf *resolverConfig) init() {
|
||||
@@ -349,7 +349,7 @@
|
||||
var resolvConf resolverConfig
|
||||
|
||||
func getSystemDNSConfig() *dnsConfig {
|
||||
- resolvConf.tryUpdate("/etc/resolv.conf")
|
||||
+ resolvConf.tryUpdate("@TERMUX_PREFIX@/etc/resolv.conf")
|
||||
return resolvConf.dnsConfig.Load()
|
||||
}
|
||||
|
||||
@@ -357,7 +357,7 @@
|
||||
func (conf *resolverConfig) init() {
|
||||
// Set dnsConfig and lastChecked so we don't parse
|
||||
// resolv.conf twice the first time.
|
||||
conf.dnsConfig = systemConf().resolv
|
||||
if conf.dnsConfig == nil {
|
||||
- conf.dnsConfig = dnsReadConfig("/etc/resolv.conf")
|
||||
+ conf.dnsConfig = dnsReadConfig("@TERMUX_PREFIX@/etc/resolv.conf")
|
||||
}
|
||||
- conf.dnsConfig.Store(dnsReadConfig("/etc/resolv.conf"))
|
||||
+ conf.dnsConfig.Store(dnsReadConfig("@TERMUX_PREFIX@/etc/resolv.conf"))
|
||||
conf.lastChecked = time.Now()
|
||||
|
||||
@@ -427,7 +427,7 @@ func (r *Resolver) lookup(ctx context.Context, name string, qtype dnsmessage.Typ
|
||||
// For consistency with libc resolvers, report no such host.
|
||||
return dnsmessage.Parser{}, "", &DNSError{Err: errNoSuchHost.Error(), Name: name, IsNotFound: true}
|
||||
}
|
||||
- resolvConf.tryUpdate("/etc/resolv.conf")
|
||||
+ resolvConf.tryUpdate("@TERMUX_PREFIX@/etc/resolv.conf")
|
||||
resolvConf.mu.RLock()
|
||||
conf := resolvConf.dnsConfig
|
||||
resolvConf.mu.RUnlock()
|
||||
@@ -604,7 +604,7 @@ func (r *Resolver) goLookupIPCNAMEOrder(ctx context.Context, network, name strin
|
||||
// See comment in func lookup above about use of errNoSuchHost.
|
||||
return nil, dnsmessage.Name{}, &DNSError{Err: errNoSuchHost.Error(), Name: name, IsNotFound: true}
|
||||
}
|
||||
- resolvConf.tryUpdate("/etc/resolv.conf")
|
||||
+ resolvConf.tryUpdate("@TERMUX_PREFIX@/etc/resolv.conf")
|
||||
resolvConf.mu.RLock()
|
||||
conf := resolvConf.dnsConfig
|
||||
resolvConf.mu.RUnlock()
|
||||
|
||||
// Prepare ch so that only one update of resolverConfig may
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# 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.19.5
|
||||
local TERMUX_GO_VERSION=go1.20
|
||||
local TERMUX_GO_PLATFORM=linux-amd64
|
||||
|
||||
local TERMUX_BUILDGO_FOLDER
|
||||
|
|
@ -20,7 +20,7 @@ termux_setup_golang() {
|
|||
rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
|
||||
termux_download https://golang.org/dl/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
|
||||
"$TERMUX_BUILDGO_TAR" \
|
||||
36519702ae2fd573c9869461990ae550c8c0d955cd28d2827a6b159fda81ff95
|
||||
5a9ebcc65c1cce56e0d2dc616aff4c4cedcfbda8cc6f0288cc08cda3b18dcbf1
|
||||
|
||||
( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue