From ed869e42dcc31e8a4d0127773c0e4dcd59f52565 Mon Sep 17 00:00:00 2001 From: Oskar <87065584+MedzikUser@users.noreply.github.com> Date: Sat, 21 Aug 2021 15:58:27 +0200 Subject: [PATCH] golang: revert to 1.16 (#7373) Issue: https://github.com/termux/termux-packages/issues/7356 --- packages/golang/build.sh | 6 +++--- scripts/build/setup/termux_setup_golang.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/golang/build.sh b/packages/golang/build.sh index ff551ff18..5cd0ba373 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -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.17 +_MAJOR_VERSION=1.16.7 # Use the ~ deb versioning construct in the future: -TERMUX_PKG_VERSION=2:${_MAJOR_VERSION} +TERMUX_PKG_VERSION=3:${_MAJOR_VERSION} TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz -TERMUX_PKG_SHA256=3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d +TERMUX_PKG_SHA256=1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac 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 e0e557099..93efe873f 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.17 + local TERMUX_GO_VERSION=go1.16.7 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" \ - 6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d + 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) else