From 43c6c153f98ab73603d0ccc478837b81e9a01872 Mon Sep 17 00:00:00 2001 From: Butta Date: Wed, 12 Aug 2020 10:39:23 +0530 Subject: [PATCH] golang: update from 1.14.7 to 1.15 --- packages/golang/build.sh | 5 ++--- scripts/build/setup/termux_setup_golang.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/golang/build.sh b/packages/golang/build.sh index f8a03dc15..847c45249 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -1,12 +1,11 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/ TERMUX_PKG_DESCRIPTION="Go programming language compiler" TERMUX_PKG_LICENSE="BSD 3-Clause" -_MAJOR_VERSION=1.14.7 +_MAJOR_VERSION=1.15 # Use the ~ deb versioning construct in the future: TERMUX_PKG_VERSION=2:${_MAJOR_VERSION} -TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz -TERMUX_PKG_SHA256=064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 +TERMUX_PKG_SHA256=69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a TERMUX_PKG_DEPENDS="clang" TERMUX_PKG_NO_STATICSPLIT=true diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index 0153a378a..8d006bddc 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -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.14.7 + local TERMUX_GO_VERSION=go1.15 local TERMUX_GO_PLATFORM=linux-amd64 local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION} @@ -14,7 +14,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" \ - 4a7fa60f323ee1416a4b1425aefc37ea359e9d64df19c326a58953a97ad41ea5 + 2d75848ac606061efe52a8068d0e647b35ce487a15bb52272c427df485193602 ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) else