X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e23b8a1fdd96e40caf7ffab221e00b1ab38d4cad..7ddd51409c1702475e0995100260fd6107ed62ba:/packages/golang/build.sh diff --git a/packages/golang/build.sh b/packages/golang/build.sh index a644a10a..b8fa9e08 100644 --- a/packages/golang/build.sh +++ b/packages/golang/build.sh @@ -1,10 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/ TERMUX_PKG_DESCRIPTION="Go programming language compiler" -local _MAJOR_VERSION=1.9.1 +local _MAJOR_VERSION=1.10.1 # 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_SHA256=a84afc9dc7d64fe0fa84d4d735e2ece23831a22117b50dafc75c1484f1cb550e +TERMUX_PKG_SHA256=589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_DEPENDS="clang" @@ -14,12 +14,12 @@ termux_step_make_install () { TERMUX_GOLANG_DIRNAME=${GOOS}_$GOARCH TERMUX_GODIR=$TERMUX_PREFIX/lib/go rm -Rf $TERMUX_GODIR - mkdir -p $TERMUX_GODIR/{src,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}} + mkdir -p $TERMUX_GODIR/{src,doc,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=clang \ + CC=gcc \ GO_LDFLAGS="-extldflags=-pie" \ GOROOT_BOOTSTRAP=$GOROOT \ GOROOT_FINAL=$TERMUX_GODIR \ @@ -30,6 +30,7 @@ termux_step_make_install () { cp VERSION $TERMUX_GODIR/ cp pkg/tool/$TERMUX_GOLANG_DIRNAME/* $TERMUX_GODIR/pkg/tool/$TERMUX_GOLANG_DIRNAME/ cp -Rf src/* $TERMUX_GODIR/src/ + cp -Rf doc/* $TERMUX_GODIR/doc/ cp pkg/include/* $TERMUX_GODIR/pkg/include/ cp -Rf lib/* $TERMUX_GODIR/lib cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/