From 7eb7ad6617099003d39195783fe2c68bee0d28ae Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 26 Feb 2019 21:30:03 +0100
Subject: [PATCH] build-package: mv termux_setup_golang to scripts/build/setup

---
 build-package.sh                           | 36 +---------------------
 scripts/build/setup/termux_setup_golang.sh | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 35 deletions(-)
 create mode 100644 scripts/build/setup/termux_setup_golang.sh

diff --git a/build-package.sh b/build-package.sh
index ab94c565a..dc1aaed49 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -10,41 +10,7 @@ source scripts/build/termux_error_exit.sh
 source scripts/build/termux_download.sh
 
 # Utility function for golang-using packages to setup a go toolchain.
-termux_setup_golang() {
-	export GOOS=android
-	export CGO_ENABLED=1
-	export GO_LDFLAGS="-extldflags=-pie"
-	if [ "$TERMUX_ARCH" = "arm" ]; then
-		export GOARCH=arm
-		export GOARM=7
-	elif [ "$TERMUX_ARCH" = "i686" ]; then
-		export GOARCH=386
-		export GO386=sse2
-	elif [ "$TERMUX_ARCH" = "aarch64" ]; then
-		export GOARCH=arm64
-	elif [ "$TERMUX_ARCH" = "x86_64" ]; then
-		export GOARCH=amd64
-	else
-		termux_error_exit "Unsupported arch: $TERMUX_ARCH"
-	fi
-
-	local TERMUX_GO_VERSION=go1.11.5
-	local TERMUX_GO_PLATFORM=linux-amd64
-
-	local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}
-	export GOROOT=$TERMUX_BUILDGO_FOLDER
-	export PATH=$GOROOT/bin:$PATH
-
-	if [ -d "$TERMUX_BUILDGO_FOLDER" ]; then return; fi
-
-	local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz
-	rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
-	termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
-		"$TERMUX_BUILDGO_TAR" \
-		ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25
-
-	( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
-}
+source scripts/build/setup/termux_setup_golang.sh
 
 # Utility function for rust-using packages to setup a rust toolchain.
 termux_setup_rust() {
diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh
new file mode 100644
index 000000000..24578c369
--- /dev/null
+++ b/scripts/build/setup/termux_setup_golang.sh
@@ -0,0 +1,36 @@
+# Utility function for golang-using packages to setup a go toolchain.
+termux_setup_golang() {
+	export GOOS=android
+	export CGO_ENABLED=1
+	export GO_LDFLAGS="-extldflags=-pie"
+	if [ "$TERMUX_ARCH" = "arm" ]; then
+		export GOARCH=arm
+		export GOARM=7
+	elif [ "$TERMUX_ARCH" = "i686" ]; then
+		export GOARCH=386
+		export GO386=sse2
+	elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+		export GOARCH=arm64
+	elif [ "$TERMUX_ARCH" = "x86_64" ]; then
+		export GOARCH=amd64
+	else
+		termux_error_exit "Unsupported arch: $TERMUX_ARCH"
+	fi
+
+	local TERMUX_GO_VERSION=go1.11.5
+	local TERMUX_GO_PLATFORM=linux-amd64
+
+	local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}
+	export GOROOT=$TERMUX_BUILDGO_FOLDER
+	export PATH=$GOROOT/bin:$PATH
+
+	if [ -d "$TERMUX_BUILDGO_FOLDER" ]; then return; fi
+
+	local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz
+	rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
+	termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
+		"$TERMUX_BUILDGO_TAR" \
+		ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25
+
+	( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
+}