X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4b25506e121469d03d857f7705b7c14a777bbdeb..494260c50d3702ec238964460fd49b394b59f47b:/packages/golang/build.sh

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index 230bc259..8f3d2385 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,54 +1,26 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-_MAJOR_VERSION=1.5.1
-# Need to be considered a higher version than "1.5rc1":
-TERMUX_PKG_VERSION=1:$_MAJOR_VERSION
+_MAJOR_VERSION=1.6
+# 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_KEEP_STATIC_LIBRARIES=true
 
-TERMUX_HOST_GOLANG_DIR=$TERMUX_PKG_CACHEDIR/go-host-$_MAJOR_VERSION
-
-termux_step_post_extract_package () {
-	if [ ! -d $TERMUX_HOST_GOLANG_DIR ]; then
-		cd $TERMUX_PKG_CACHEDIR
-		GOHOST_TARFILE=go-host-${_MAJOR_VERSION}.tar.gz
-		if [ ! -f $GOHOST_TARFILE ]; then
-			curl -o $GOHOST_TARFILE https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.linux-amd64.tar.gz
-		fi
-		tar xf $GOHOST_TARFILE
-		mv go $TERMUX_HOST_GOLANG_DIR
-	fi
-}
-
 termux_step_make_install () {
-	if [ "$TERMUX_ARCH" = "arm" ]; then
-		export GOOS=android
-	    	export CGO_ENABLED=1
-		export GOARCH=arm
-		export GOARM=7
-	elif [ "$TERMUX_ARCH" = "i686" ]; then
-		export GOOS=linux
-	    	export CGO_ENABLED=0
-		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}
+	mkdir -p $TERMUX_GODIR/{src,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}_shared}
 
 	cd $TERMUX_PKG_SRCDIR/src
 	env CC_FOR_TARGET=$CC \
 	    CXX_FOR_TARGET=$CXX \
 	    CC=gcc \
 	    GO_LDFLAGS="-extldflags=-pie" \
-	    GOROOT_BOOTSTRAP=$TERMUX_HOST_GOLANG_DIR \
+	    GOROOT_BOOTSTRAP=$GOROOT \
             GOROOT_FINAL=$TERMUX_GODIR \
 	    ./make.bash
 
@@ -58,7 +30,7 @@ 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/* $TERMUX_GODIR/pkg/$TERMUX_GOLANG_DIRNAME/
+	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/
 }
 
 termux_step_post_massage () {