golang: upgrade to 1.17.1 (#7416)

This commit is contained in:
Oskar 2021-09-13 18:50:02 +02:00 committed by GitHub
parent 17e7edd002
commit 8a780c7c7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 19 deletions

View File

@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/
TERMUX_PKG_DESCRIPTION="Go programming language compiler" TERMUX_PKG_DESCRIPTION="Go programming language compiler"
TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
_MAJOR_VERSION=1.16.7 _MAJOR_VERSION=1.17.1
# Use the ~ deb versioning construct in the future: # Use the ~ deb versioning construct in the future:
TERMUX_PKG_VERSION=3:${_MAJOR_VERSION} TERMUX_PKG_VERSION=3:${_MAJOR_VERSION}
TERMUX_PKG_REVISION=1 TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
TERMUX_PKG_SHA256=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac TERMUX_PKG_SHA256=49dc08339770acd5613312db8c141eaf61779995577b89d93b541ef83067e5b1
TERMUX_PKG_DEPENDS="clang" TERMUX_PKG_DEPENDS="clang"
TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_NO_STATICSPLIT=true

View File

@ -1,15 +0,0 @@
--- ../go/src/os/file_unix.go 2015-08-06 00:36:35.000000000 -0400
+++ ./src/os/file_unix.go 2015-08-14 03:28:11.634760646 -0400
@@ -329,11 +329,7 @@
func TempDir() string {
dir := Getenv("TMPDIR")
if dir == "" {
- if runtime.GOOS == "android" {
- dir = "/data/local/tmp"
- } else {
- dir = "/tmp"
- }
+ dir = "@TERMUX_PREFIX@/tmp"
}
return dir
}

View File

@ -1,7 +1,7 @@
# Utility function for golang-using packages to setup a go toolchain. # Utility function for golang-using packages to setup a go toolchain.
termux_setup_golang() { termux_setup_golang() {
if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
local TERMUX_GO_VERSION=go1.16.7 local TERMUX_GO_VERSION=go1.17.1
local TERMUX_GO_PLATFORM=linux-amd64 local TERMUX_GO_PLATFORM=linux-amd64
local TERMUX_BUILDGO_FOLDER local TERMUX_BUILDGO_FOLDER
@ -20,7 +20,7 @@ termux_setup_golang() {
rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER" rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
termux_download https://golang.org/dl/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \ termux_download https://golang.org/dl/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
"$TERMUX_BUILDGO_TAR" \ "$TERMUX_BUILDGO_TAR" \
7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 dab7d9c34361dc21ec237d584590d72500652e7c909bf082758fb63064fca0ef
( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
else else