~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: Update from 3.10.3 to 3.11.0
[termux-packages]
/
packages
/
golang
/
build.sh
diff --git
a/packages/golang/build.sh
b/packages/golang/build.sh
index
ad7d262
..
b8fa9e0
100644
(file)
--- a/
packages/golang/build.sh
+++ b/
packages/golang/build.sh
@@
-1,33
+1,20
@@
TERMUX_PKG_HOMEPAGE=https://golang.org/
TERMUX_PKG_DESCRIPTION="Go programming language compiler"
TERMUX_PKG_HOMEPAGE=https://golang.org/
TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-
_MAJOR_VERSION=1.6beta
1
-#
Need to be considered a higher version than "1.5rc1"
:
-TERMUX_PKG_VERSION=
1:$_MAJOR_VERSION
+
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_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
-TERMUX_PKG_
FOLDERNAME=go
+TERMUX_PKG_
SHA256=589449ff6c3ccbff1d391d4e7ab5bb5d5643a5a41a04c99315e55c16bbf73ddc
TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
+TERMUX_PKG_DEPENDS="clang"
termux_step_make_install () {
termux_step_make_install () {
- export GOOS=android
- export CGO_ENABLED=1
- if [ "$TERMUX_ARCH" = "arm" ]; then
- export GOARCH=arm
- export GOARM=7
- elif [ "$TERMUX_ARCH" = "i686" ]; then
- 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_GOLANG_DIRNAME=${GOOS}_$GOARCH
-
TERMUX_GODIR=$TERMUX_PREFIX/lib/go
rm -Rf $TERMUX_GODIR
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}
-
- termux_setup_golang
+ 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 \
cd $TERMUX_PKG_SRCDIR/src
env CC_FOR_TARGET=$CC \
@@
-35,7
+22,7
@@
termux_step_make_install () {
CC=gcc \
GO_LDFLAGS="-extldflags=-pie" \
GOROOT_BOOTSTRAP=$GOROOT \
CC=gcc \
GO_LDFLAGS="-extldflags=-pie" \
GOROOT_BOOTSTRAP=$GOROOT \
-
GOROOT_FINAL=$TERMUX_GODIR \
+ GOROOT_FINAL=$TERMUX_GODIR \
./make.bash
cd ..
./make.bash
cd ..
@@
-43,8
+30,10
@@
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 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 pkg/include/* $TERMUX_GODIR/pkg/include/
- cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}_shared/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}_shared/
+ cp -Rf lib/* $TERMUX_GODIR/lib
+ cp -Rf pkg/${TERMUX_GOLANG_DIRNAME}/* $TERMUX_GODIR/pkg/${TERMUX_GOLANG_DIRNAME}/
}
termux_step_post_massage () {
}
termux_step_post_massage () {