X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/3a189d898c443782a48a6dd87bd0b58eaf9d1bf1..90232239479eb48f8c279d3f32af6d734dae927b:/packages/golang/build.sh

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index ad7d2621..5ce86bd4 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,33 +1,20 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-_MAJOR_VERSION=1.6beta1
-# Need to be considered a higher version than "1.5rc1":
-TERMUX_PKG_VERSION=1:$_MAJOR_VERSION
+local _MAJOR_VERSION=1.9.3
+# Use the ~ deb versioning construct in the future:
+TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
-TERMUX_PKG_FOLDERNAME=go
+TERMUX_PKG_SHA256=4e3d0ad6e91e02efa77d54e86c8b9e34fbe1cbc2935b6d38784dca93331c47ae
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
+TERMUX_PKG_DEPENDS="clang"
 
 termux_step_make_install () {
-	export GOOS=android
-	export CGO_ENABLED=1
-	if [ "$TERMUX_ARCH" = "arm" ]; then
-		export GOARCH=arm
-		export GOARM=7
-	elif [ "$TERMUX_ARCH" = "i686" ]; then
-		export GOARCH=386
-		export GO386=sse2
-	else
-		echo "ERROR: Unsupported arch: $TERMUX_ARCH"
-		exit 1
-	fi
+	termux_setup_golang
 
 	TERMUX_GOLANG_DIRNAME=${GOOS}_$GOARCH
-
 	TERMUX_GODIR=$TERMUX_PREFIX/lib/go
 	rm -Rf $TERMUX_GODIR
-	mkdir -p $TERMUX_GODIR/{src,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}_shared}
-
-	termux_setup_golang
+	mkdir -p $TERMUX_GODIR/{src,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}}
 
 	cd $TERMUX_PKG_SRCDIR/src
 	env CC_FOR_TARGET=$CC \
@@ -35,7 +22,7 @@ termux_step_make_install () {
 	    CC=gcc \
 	    GO_LDFLAGS="-extldflags=-pie" \
 	    GOROOT_BOOTSTRAP=$GOROOT \
-            GOROOT_FINAL=$TERMUX_GODIR \
+	    GOROOT_FINAL=$TERMUX_GODIR \
 	    ./make.bash
 
 	cd ..
@@ -44,7 +31,8 @@ termux_step_make_install () {
 	cp pkg/tool/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/
 	cp -Rf src/* $TERMUX_GODIR/src/
 	cp pkg/include/* $TERMUX_GODIR/pkg/include/
-	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/
+	cp -Rf lib/* $TERMUX_GODIR/lib
+	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/
 }
 
 termux_step_post_massage () {