From 034efbb5070bf69c271857b9347e0567187687cf Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 13 Apr 2022 13:26:04 +0900 Subject: [PATCH] golang: Update to 1.18.1 --- 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 9fe39f03f..e28cab318 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -2,12 +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.18 +_MAJOR_VERSION=1.18.1 # Use the ~ deb versioning construct in the future: TERMUX_PKG_VERSION=3:${_MAJOR_VERSION} -TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz -TERMUX_PKG_SHA256=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 +TERMUX_PKG_SHA256=efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088 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 7eee1e9a1..50fc960a4 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.18 + local TERMUX_GO_VERSION=go1.18.1 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" \ - e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f + b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334 ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )