X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/3679937a490c4bc6d2bdad13ce3e032799a14504..29aa0bc89f7a063b46ea0e5b5d03da2ed75636b5:/packages/golang/build.sh

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index b1e25e9a..0497eaed 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -2,10 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
 _MAJOR_VERSION=1.7
 # Use the ~ deb versioning construct in the future:
-TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}~beta2
-TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}beta2.src.tar.gz
+TERMUX_PKG_VERSION=2:${_MAJOR_VERSION}
+TERMUX_PKG_BUILD_REVISION=1
+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_PKG_DEPENDS="clang"
 
 termux_step_make_install () {
 	termux_setup_golang
@@ -13,7 +15,7 @@ termux_step_make_install () {
 	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}
+	mkdir -p $TERMUX_GODIR/{src,lib,pkg/tool/$TERMUX_GOLANG_DIRNAME,pkg/include,pkg/${TERMUX_GOLANG_DIRNAME}_shared}
 
 	cd $TERMUX_PKG_SRCDIR/src
 	env CC_FOR_TARGET=$CC \
@@ -30,6 +32,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 lib/* $TERMUX_GODIR/lib
 	cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/
 }