golang: Update from 1.9.2 to 1.9.3

[termux-packages] / packages / golang / build.sh

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index daabd5b..5ce86bd 100644 (file)
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,52 +1,28 @@
 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=${_MAJOR_VERSION}.rel
+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_HOST_GOLANG_DIR=$TERMUX_PKG_CACHEDIR/go-host-$TERMUX_PKG_VERSION
-
-termux_step_post_extract_package () {
-       if [ ! -d $TERMUX_HOST_GOLANG_DIR ]; then
-               cd $TERMUX_PKG_CACHEDIR
-               curl -o go-host.tar.gz https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.linux-amd64.tar.gz
-               tar xf go-host.tar.gz
-               mv go $TERMUX_HOST_GOLANG_DIR
-       fi
-}
+TERMUX_PKG_DEPENDS="clang"
 
 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,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}}
 
        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_FINAL=$TERMUX_GODIR \
+           GOROOT_BOOTSTRAP=$GOROOT \
+           GOROOT_FINAL=$TERMUX_GODIR \
            ./make.bash
 
        cd ..
@@ -55,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/* $TERMUX_GODIR/pkg/$TERMUX_GOLANG_DIRNAME/
+       cp -Rf lib/* $TERMUX_GODIR/lib
+       cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/
 }
 
 termux_step_post_massage () {