diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index 3f5d0b6cf4..0396283c15 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -2,6 +2,11 @@ termux_setup_golang() { if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then local TERMUX_GO_VERSION=go1.20.2 + local TERMUX_GO_SHA256=4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768 + if [ "$TERMUX_PKG_GO_USE_OLDER" = "true" ]; then + TERMUX_GO_VERSION=go1.19.7 + TERMUX_GO_SHA256=7a75720c9b066ae1750f6bcc7052aba70fa3813f4223199ee2a2315fd3eb533d + fi local TERMUX_GO_PLATFORM=linux-amd64 local TERMUX_BUILDGO_FOLDER @@ -20,11 +25,13 @@ 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" \ - 4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768 + "$TERMUX_GO_SHA256" ( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" ) - ( cd "$TERMUX_BUILDGO_FOLDER"; . ${TERMUX_SCRIPTDIR}/packages/golang/fix-hardcoded-etc-resolv-conf.sh ) + if [ "$TERMUX_PKG_GO_USE_OLDER" = "false" ]; then + ( cd "$TERMUX_BUILDGO_FOLDER"; . ${TERMUX_SCRIPTDIR}/packages/golang/fix-hardcoded-etc-resolv-conf.sh ) + fi else if [[ "$TERMUX_APP_PACKAGE_MANAGER" = "apt" && "$(dpkg-query -W -f '${db:Status-Status}\n' golang 2>/dev/null)" != "installed" ]] || [[ "$TERMUX_APP_PACKAGE_MANAGER" = "pacman" && ! "$(pacman -Q golang 2>/dev/null)" ]]; then diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index 00f6818d76..0e2e0c1d9d 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -100,6 +100,7 @@ termux_step_setup_variables() { TERMUX_PKG_EXTRA_MAKE_ARGS="" TERMUX_PKG_FORCE_CMAKE=false # if the package has autotools as well as cmake, then set this to prefer cmake TERMUX_PKG_GIT_BRANCH="" # branch defaults to 'v$TERMUX_PKG_VERSION' unless this variable is defined + TERMUX_PKG_GO_USE_OLDER=false # set to true to use the older supported release of Go. TERMUX_PKG_HAS_DEBUG=true # set to false if debug build doesn't exist or doesn't work, for example for python based packages TERMUX_PKG_HOMEPAGE="" TERMUX_PKG_HOSTBUILD=false # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR: