wget: Update from 1.16.3 to 1.17

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

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index b27b53c..daabd5b 100644 (file)
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,7 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-TERMUX_PKG_VERSION=1.5rc1
-TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go1.5rc1.src.tar.gz
+_MAJOR_VERSION=1.5.1
+# Need to be considered a higher version than "1.5rc1":
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.rel
+TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
 TERMUX_PKG_FOLDERNAME=go
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 
@@ -10,7 +12,7 @@ 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${TERMUX_PKG_VERSION}.linux-amd64.tar.gz
+               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
@@ -18,11 +20,13 @@ termux_step_post_extract_package () {
 
 termux_step_make_install () {
        if [ "$TERMUX_ARCH" = "arm" ]; then
-               TERMUX_GOLANG_DIRNAME=linux_arm
+               export GOOS=android
+               export CGO_ENABLED=1
                export GOARCH=arm
                export GOARM=7
        elif [ "$TERMUX_ARCH" = "i686" ]; then
-               TERMUX_GOLANG_DIRNAME=linux_386
+               export GOOS=linux
+               export CGO_ENABLED=0
                export GOARCH=386
                export GO386=sse2
        else
@@ -30,12 +34,20 @@ termux_step_make_install () {
                exit 1
        fi
 
+       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}
 
        cd $TERMUX_PKG_SRCDIR/src
-       env CC_FOR_TARGET=$CC CC=gcc GOROOT_BOOTSTRAP=$TERMUX_HOST_GOLANG_DIR GOROOT_FINAL=$TERMUX_GODIR GOOS=linux ./make.bash
+       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 \
+           ./make.bash
 
        cd ..
        cp bin/$TERMUX_GOLANG_DIRNAME/{go,gofmt} $TERMUX_PREFIX/bin
@@ -45,3 +57,7 @@ termux_step_make_install () {
        cp pkg/include/* $TERMUX_GODIR/pkg/include/
        cp -Rf pkg/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/$TERMUX_GOLANG_DIRNAME/
 }
+
+termux_step_post_massage () {
+       find . -path '*/testdata*' -delete
+}