From 4b8c077711d2a1237e616d28633817a881fb38dc Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 10 Jul 2021 17:00:18 +0300 Subject: [PATCH] Revert "Merge pull request #7104 from thunder-coding/cache-godeps" This reverts commit f6892c38d82a3fb68d4a267f97ac9ebf9459e16e, reversing changes made to 4d9075fea318304ef59cc13f0f478b084eb8831e. --- packages/aerc/build.sh | 1 - packages/age/build.sh | 5 +-- packages/antibody/build.sh | 1 - packages/aptly/build.sh | 1 - packages/brook/build.sh | 2 +- packages/caddy/build.sh | 1 - packages/chezmoi/build.sh | 2 +- packages/clash/build.sh | 3 +- packages/croc/build.sh | 2 +- packages/delve/build.sh | 2 +- packages/direnv/build.sh | 1 - packages/duf/build.sh | 2 +- packages/elvish/build.sh | 1 - packages/flyctl/build.sh | 2 +- packages/fzf/build.sh | 2 +- packages/germanium/build.sh | 5 ++- packages/geth/build.sh | 1 - packages/gh/build.sh | 2 +- packages/git-lfs/build.sh | 1 - packages/gitea/build.sh | 1 - packages/glow/build.sh | 2 +- packages/go-findimagedupes/build.sh | 3 +- packages/gogs/build.sh | 4 +-- packages/gopass/build.sh | 1 - packages/gotty/build.sh | 1 - packages/helm/build.sh | 1 - packages/hub/build.sh | 2 -- packages/hugo/build.sh | 40 +++++++++++----------- packages/hydroxide/build.sh | 1 - packages/ipfs/build.sh | 3 +- packages/jfrog-cli/build.sh | 3 +- packages/k9s/build.sh | 2 +- packages/kubectl/build.sh | 1 - packages/lazygit/build.sh | 2 +- packages/lf/build.sh | 1 - packages/micro/build.sh | 1 - packages/o-editor/build.sh | 1 - packages/obfs4proxy/build.sh | 2 +- packages/proton-bridge/build.sh | 14 +++----- packages/pup/build.sh | 2 +- packages/rclone/build.sh | 1 - packages/restic/build.sh | 1 - packages/rush/build.sh | 2 +- packages/shell2http/build.sh | 2 +- packages/shiori/build.sh | 2 +- packages/slides/build.sh | 5 +-- packages/sops/build.sh | 2 +- packages/syncthing/build.sh | 3 +- packages/teleport-tsh/build.sh | 5 +-- packages/tweego/build.sh | 2 +- packages/vegeta/build.sh | 1 - packages/virustotal-cli/build.sh | 1 - packages/wuzz/build.sh | 1 - packages/youtubedr/build.sh | 2 +- scripts/build/setup/termux_setup_golang.sh | 19 ---------- 55 files changed, 63 insertions(+), 111 deletions(-) diff --git a/packages/aerc/build.sh b/packages/aerc/build.sh index b989b12ee..5756b2f37 100644 --- a/packages/aerc/build.sh +++ b/packages/aerc/build.sh @@ -10,5 +10,4 @@ TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { termux_setup_golang - termux_go_get } diff --git a/packages/age/build.sh b/packages/age/build.sh index 1756e8b21..91fceb56f 100644 --- a/packages/age/build.sh +++ b/packages/age/build.sh @@ -5,11 +5,12 @@ TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.0.0-rc.3 TERMUX_PKG_SRCURL=https://github.com/FiloSottile/age/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e352d8b4e08e0b493adf7ab3ea15b349fe07ab833d20395012aa516ea0c36708 -TERMUX_PKG_BUILD_IN_SRC="true" termux_step_make() { termux_setup_golang - termux_go_get + export GOPATH=$TERMUX_PKG_BUILDDIR + + cd $TERMUX_PKG_SRCDIR go build ./cmd/age go build ./cmd/age-keygen } diff --git a/packages/antibody/build.sh b/packages/antibody/build.sh index a577c7c6b..84aefb12f 100644 --- a/packages/antibody/build.sh +++ b/packages/antibody/build.sh @@ -14,7 +14,6 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/getantibody/antibody cd "$GOPATH"/src/github.com/getantibody/antibody - termux_go_get -d -v go build } diff --git a/packages/aptly/build.sh b/packages/aptly/build.sh index 3b6ef0791..37b0d0f6f 100644 --- a/packages/aptly/build.sh +++ b/packages/aptly/build.sh @@ -17,7 +17,6 @@ termux_step_make() { go mod init go mod vendor - termux_go_get -d -v make install VERSION=$TERMUX_PKG_VERSION } diff --git a/packages/brook/build.sh b/packages/brook/build.sh index 0e144c544..d052333d3 100644 --- a/packages/brook/build.sh +++ b/packages/brook/build.sh @@ -16,7 +16,7 @@ termux_step_make() { mkdir -p "$TERMUX_PREFIX"/share/doc/brook cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/txthinking/brook cd "$GOPATH"/src/github.com/txthinking/brook/cli/brook - termux_go_get -d -v + go get -d -v go build -o brook } diff --git a/packages/caddy/build.sh b/packages/caddy/build.sh index fa5990016..3cef6a373 100644 --- a/packages/caddy/build.sh +++ b/packages/caddy/build.sh @@ -15,7 +15,6 @@ termux_step_make() { cd $GOPATH/src/github.com/caddyserver/caddy/cmd/caddy export GO111MODULE=on - termux_go_get -d -v go build -v . } diff --git a/packages/chezmoi/build.sh b/packages/chezmoi/build.sh index 0d57f6705..1b3751c9f 100644 --- a/packages/chezmoi/build.sh +++ b/packages/chezmoi/build.sh @@ -15,7 +15,7 @@ termux_step_make() { cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi" - termux_go_get -d -v + go get -d -v go build -tags noupgrade,noembeddocs \ -ldflags "-X github.com/twpayne/chezmoi/cmd.DocsDir=$TERMUX_PREFIX/share/doc/chezmoi -X main.version=${TERMUX_PKG_VERSION}" . } diff --git a/packages/clash/build.sh b/packages/clash/build.sh index 9acd469d8..88abf9493 100644 --- a/packages/clash/build.sh +++ b/packages/clash/build.sh @@ -12,8 +12,7 @@ termux_step_make() { mkdir ./gopath export GOPATH="$PWD/gopath" - - termux_go_get + GOBUILD=CGO_ENABLED=0 \ go build \ -trimpath \ diff --git a/packages/croc/build.sh b/packages/croc/build.sh index 2839d1b35..00f1f0c8b 100644 --- a/packages/croc/build.sh +++ b/packages/croc/build.sh @@ -11,7 +11,7 @@ termux_step_make() { cd $TERMUX_PKG_SRCDIR termux_setup_golang - termux_go_get + go build -o croc -trimpath } diff --git a/packages/delve/build.sh b/packages/delve/build.sh index dcc6f0e6c..2b120f252 100644 --- a/packages/delve/build.sh +++ b/packages/delve/build.sh @@ -16,7 +16,7 @@ termux_step_make() { mkdir -p "$TERMUX_PREFIX"/share/doc/delve cp -a "$TERMUX_PKG_SRCDIR" "$TERMUX_PKG_BUILDDIR"/src/github.com/go-delve/delve/ cd "$TERMUX_PKG_BUILDDIR"/src/github.com/go-delve/delve/cmd/dlv/ - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/direnv/build.sh b/packages/direnv/build.sh index 00164c945..8d1607df3 100644 --- a/packages/direnv/build.sh +++ b/packages/direnv/build.sh @@ -9,7 +9,6 @@ TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang - termux_go_get make } diff --git a/packages/duf/build.sh b/packages/duf/build.sh index 0ef68b6f7..d43a3d97b 100644 --- a/packages/duf/build.sh +++ b/packages/duf/build.sh @@ -15,7 +15,7 @@ termux_step_make() { cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/muesli/duf" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/muesli/duf" - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/elvish/build.sh b/packages/elvish/build.sh index 954563dde..a6be92713 100644 --- a/packages/elvish/build.sh +++ b/packages/elvish/build.sh @@ -14,7 +14,6 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/elves/elvish cd "$GOPATH"/src/github.com/elves/elvish - termux_go_get -d -v go build } diff --git a/packages/flyctl/build.sh b/packages/flyctl/build.sh index 21798f9a7..696a22632 100644 --- a/packages/flyctl/build.sh +++ b/packages/flyctl/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_BLACKLISTED_ARCHES="i686, arm" termux_step_post_get_source() { termux_setup_golang export GOPATH=$TERMUX_PKG_SRCDIR/go - termux_go_get + go get chmod 777 $GOPATH -R } diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh index 53905d71e..6893e48d4 100644 --- a/packages/fzf/build.sh +++ b/packages/fzf/build.sh @@ -28,7 +28,7 @@ termux_step_make() { TERMUX_PKG_SRCDIR=$GOPATH/src/github.com/junegunn/fzf cd $GOPATH/src/github.com/junegunn/fzf - termux_go_get -d -v github.com/junegunn/fzf + go get -d -v github.com/junegunn/fzf go build } diff --git a/packages/germanium/build.sh b/packages/germanium/build.sh index 2868a0348..0b65fa549 100644 --- a/packages/germanium/build.sh +++ b/packages/germanium/build.sh @@ -2,14 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://github.com/matsuyoshi30/germanium TERMUX_PKG_DESCRIPTION="Generate image from source code" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Raven Ravener " -TERMUX_PKG_VERSION=1.2.0 +TERMUX_PKG_VERSION=1.1.0 TERMUX_PKG_SRCURL=https://github.com/matsuyoshi30/germanium/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=9a2b190ea7e8211ed03fa6860aea73ef06228266d7b6e4d32df2031fdf1c9606 +TERMUX_PKG_SHA256=afd39dc311b0c5226a9a197c07b13d52c6fc2557543951f4ba98910c19824881 TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang - termux_go_get make build } diff --git a/packages/geth/build.sh b/packages/geth/build.sh index 669b02735..c5dc07917 100644 --- a/packages/geth/build.sh +++ b/packages/geth/build.sh @@ -14,7 +14,6 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/ethereum/go-ethereum cd "$GOPATH"/src/github.com/ethereum/go-ethereum - termux_go_get -d -v for applet in geth abigen bootnode ethkey evm rlpdump puppeth; do (cd ./cmd/"$applet" && go build -v) done diff --git a/packages/gh/build.sh b/packages/gh/build.sh index 0276237de..7a0551c99 100755 --- a/packages/gh/build.sh +++ b/packages/gh/build.sh @@ -20,7 +20,7 @@ termux_step_make() { mkdir -p "$TERMUX_PREFIX"/share/doc/gh cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/cli/cli cd "$GOPATH"/src/github.com/cli/cli/cmd/gh - termux_go_get -d -v + go get -d -v go build -ldflags="-X github.com/cli/cli/internal/build.Version=$TERMUX_PKG_VERSION" } diff --git a/packages/git-lfs/build.sh b/packages/git-lfs/build.sh index bb09dfec1..5acf7d742 100644 --- a/packages/git-lfs/build.sh +++ b/packages/git-lfs/build.sh @@ -15,7 +15,6 @@ termux_step_make() { cd "$GOPATH"/github.com/git-lfs/git-lfs ! $TERMUX_ON_DEVICE_BUILD && GOOS=linux GOARCH=amd64 CC=gcc LD=gcc go generate github.com/git-lfs/git-lfs/commands - termux_go_get -d -v go build git-lfs.go } diff --git a/packages/gitea/build.sh b/packages/gitea/build.sh index 08dd04e93..daefc0cff 100644 --- a/packages/gitea/build.sh +++ b/packages/gitea/build.sh @@ -20,7 +20,6 @@ termux_step_make() { LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.CustomConf=$TERMUX_PREFIX/etc/gitea/app.ini" LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.AppWorkPath=$TERMUX_PREFIX/var/lib/gitea" LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.CustomPath=$TERMUX_PREFIX/var/lib/gitea" - termux_go_get -d -v GITEA_VERSION=v"$TERMUX_PKG_VERSION" TAGS="bindata sqlite" make all } diff --git a/packages/glow/build.sh b/packages/glow/build.sh index 3ff33489d..0b8a5f0bf 100644 --- a/packages/glow/build.sh +++ b/packages/glow/build.sh @@ -16,7 +16,7 @@ termux_step_make() { cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow" - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/go-findimagedupes/build.sh b/packages/go-findimagedupes/build.sh index daaa06869..03bf6ca56 100644 --- a/packages/go-findimagedupes/build.sh +++ b/packages/go-findimagedupes/build.sh @@ -23,8 +23,7 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/gitlab.com/opennota/findimagedupes cd "$GOPATH"/src/gitlab.com/opennota/findimagedupes - - termux_go_get -d -v + go build . } diff --git a/packages/gogs/build.sh b/packages/gogs/build.sh index 83d778421..e1ed43b80 100644 --- a/packages/gogs/build.sh +++ b/packages/gogs/build.sh @@ -15,7 +15,7 @@ termux_step_handle_hostbuild() { export GOPATH=$TERMUX_PKG_HOSTBUILD_DIR mkdir -p $TERMUX_PKG_HOSTBUILD_DIR cd $TERMUX_PKG_HOSTBUILD_DIR - termux_go_get -u github.com/kevinburke/go-bindata/... + go get -u github.com/kevinburke/go-bindata/... } termux_step_make() { @@ -30,7 +30,7 @@ termux_step_make() { LDFLAGS+=" -X gogs.io/gogs/internal/conf.CustomConf=$TERMUX_PREFIX/etc/gogs/app.ini" LDFLAGS+=" -X gogs.io/gogs/internal/conf.AppWorkPath=$TERMUX_PREFIX/var/lib/gogs" LDFLAGS+=" -X gogs.io/gogs/internal/conf.CustomPath=$TERMUX_PREFIX/var/lib/gogs" - termux_go_get + PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/bin GOGS_VERSION=v"$TERMUX_PKG_VERSION" TAGS="bindata sqlite" make all } diff --git a/packages/gopass/build.sh b/packages/gopass/build.sh index 0ba25d1a0..ddb40724d 100644 --- a/packages/gopass/build.sh +++ b/packages/gopass/build.sh @@ -18,7 +18,6 @@ termux_step_make() { rm -f ./src/github.com/gopasspw/gopass/gopass make -C ./src/github.com/gopasspw/gopass build CLIPHELPERS="-X github.com/gopasspw/gopass/pkg/clipboard.Helpers=termux-api'" - # TODO: Cache Go dependencies for on device builds install -Dm700 \ ./src/github.com/gopasspw/gopass/gopass \ "$TERMUX_PREFIX"/bin/gopass diff --git a/packages/gotty/build.sh b/packages/gotty/build.sh index f92a82c3a..5b4070b06 100644 --- a/packages/gotty/build.sh +++ b/packages/gotty/build.sh @@ -17,7 +17,6 @@ termux_step_make() { cd "$GOPATH"/src/github.com/yudai/gotty go mod init || go mod download #go mod tidy - termux_go_get -d -v go build } diff --git a/packages/helm/build.sh b/packages/helm/build.sh index 7cd610334..f05a9784b 100644 --- a/packages/helm/build.sh +++ b/packages/helm/build.sh @@ -12,7 +12,6 @@ termux_step_make() { mkdir -p "${TERMUX_PKG_BUILDDIR}/src/github.com/helm" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm" - # TODO: Cache Golang dependencies make } diff --git a/packages/hub/build.sh b/packages/hub/build.sh index 9801007de..5bdfa6cc8 100644 --- a/packages/hub/build.sh +++ b/packages/hub/build.sh @@ -18,7 +18,6 @@ termux_step_host_build() { cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub" cd "${GOPATH}/src/github.com/github/hub" - termux_go_get -d -v make man-pages } @@ -31,7 +30,6 @@ termux_step_make_install() { mkdir -p "${GOPATH}/src/github.com/github" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub" cd "${GOPATH}/src/github.com/github/hub" - termux_go_get -d -v make bin/hub "prefix=$TERMUX_PREFIX" install -Dm700 ./bin/hub "$TERMUX_PREFIX"/bin/hub diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index e8cba0ae6..545a93134 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -6,36 +6,36 @@ TERMUX_PKG_VERSION=0.85.0 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24 TERMUX_PKG_DEPENDS="libc++" -TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang - export GOPATH=$TERMUX_PKG_SRCDIR/go - termux_go_get + export GOPATH=$TERMUX_PKG_BUILDDIR + + cd $TERMUX_PKG_SRCDIR go build \ - -o hugo \ + -o "$TERMUX_PREFIX/bin/hugo" \ + -tags "linux extended" \ main.go - if ! $TERMUX_ON_DEVICE_BUILD; then - chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg - unset GOOS GOARCH CGO_LDFLAGS - unset CC CXX CFLAGS CXXFLAGS LDFLAGS - go build \ - -o hugo-host \ - main.go - fi + # "linux" tag should not be necessary + # try removing when golang version is upgraded + + # Building for host to generate manpages and completion. + chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg + unset GOOS GOARCH CGO_LDFLAGS + unset CC CXX CFLAGS CXXFLAGS LDFLAGS + go build \ + -o "$TERMUX_PKG_BUILDDIR/hugo" \ + -tags "linux extended" \ + main.go + # "linux" tag should not be necessary + # try removing when golang version is upgraded } termux_step_make_install() { - if $TERMUX_ON_DEVICE_BUILD; then - export HUGO=$TERMUX_PKG_SRCDIR/hugo - else - export HUGO=$TERMUX_PKG_SRCDIR/hugo-host - fi - install -Dm700 -t "$TERMUX_PREFIX"/bin "$TERMUX_PKG_SRCDIR"/hugo mkdir -p $TERMUX_PREFIX/share/{bash-completion/completions,man/man1} - $HUGO gen autocomplete \ + $TERMUX_PKG_BUILDDIR/hugo gen autocomplete \ --completionfile=$TERMUX_PREFIX/share/bash-completion/completions/hugo - $HUGO gen man \ + $TERMUX_PKG_BUILDDIR/hugo gen man \ --dir=$TERMUX_PREFIX/share/man/man1/ } diff --git a/packages/hydroxide/build.sh b/packages/hydroxide/build.sh index 7369210de..731cb9e8a 100644 --- a/packages/hydroxide/build.sh +++ b/packages/hydroxide/build.sh @@ -12,7 +12,6 @@ termux_step_make() { export GOPATH=$TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_SRCDIR - #TODO: Cache Golang dependencies go build ./cmd/hydroxide } diff --git a/packages/ipfs/build.sh b/packages/ipfs/build.sh index 80499ea78..8c951085a 100644 --- a/packages/ipfs/build.sh +++ b/packages/ipfs/build.sh @@ -25,8 +25,7 @@ termux_step_make() { mkdir -p "${GOPATH}/src/github.com/ipfs" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs" cd "${GOPATH}/src/github.com/ipfs/go-ipfs" - - termux_go_get -d -v + make build # Fix folders without write permissions preventing which fails repeating builds: diff --git a/packages/jfrog-cli/build.sh b/packages/jfrog-cli/build.sh index 4b703b732..2bdcbc634 100644 --- a/packages/jfrog-cli/build.sh +++ b/packages/jfrog-cli/build.sh @@ -12,9 +12,9 @@ termux_step_make() { export GOPATH=$TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_SRCDIR - termux_go_get go build \ -o "$TERMUX_PREFIX/bin/jfrog" \ + -tags "linux extended" \ main.go # "linux" tag should not be necessary # try removing when golang version is upgraded @@ -25,6 +25,7 @@ termux_step_make() { unset CC CXX CFLAGS CXXFLAGS LDFLAGS go build \ -o "$TERMUX_PKG_BUILDDIR/jfrog" \ + -tags "linux extended" \ main.go # "linux" tag should not be necessary # try removing when golang version is upgraded diff --git a/packages/k9s/build.sh b/packages/k9s/build.sh index bff30edf3..6bbbe4ee0 100644 --- a/packages/k9s/build.sh +++ b/packages/k9s/build.sh @@ -13,7 +13,7 @@ termux_step_make() { cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/derailed/k9s" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/derailed/k9s" - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/kubectl/build.sh b/packages/kubectl/build.sh index d3a1f131c..b13d90468 100644 --- a/packages/kubectl/build.sh +++ b/packages/kubectl/build.sh @@ -34,7 +34,6 @@ termux_step_make() { #rm -rf "$TERMUX_PKG_SRCDIR"/_output cd "$TERMUX_PKG_SRCDIR"/cmd/kubectl - termux_go_get -d -v go build . } diff --git a/packages/lazygit/build.sh b/packages/lazygit/build.sh index 904bc6ccf..d97879ce4 100644 --- a/packages/lazygit/build.sh +++ b/packages/lazygit/build.sh @@ -16,7 +16,7 @@ termux_step_make() { cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/jesseduffield/lazygit" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/jesseduffield/lazygit" - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/lf/build.sh b/packages/lf/build.sh index 1f6835050..3fde8a909 100644 --- a/packages/lf/build.sh +++ b/packages/lf/build.sh @@ -13,7 +13,6 @@ termux_step_make() { mkdir -p "$GOPATH/src/github.com/gokcehan" ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH/src/github.com/gokcehan/lf" cd "$GOPATH/src/github.com/gokcehan/lf" - termux_go_get -d -v go build -ldflags="-X main.gVersion=r$TERMUX_PKG_VERSION" -trimpath } diff --git a/packages/micro/build.sh b/packages/micro/build.sh index a5a3a7516..cb88e3f7a 100644 --- a/packages/micro/build.sh +++ b/packages/micro/build.sh @@ -21,7 +21,6 @@ termux_step_make_install() { cd $MICRO_SRC make build-quick - # TODO: Cache Golamg dependencies mv micro $TERMUX_PREFIX/bin/micro } diff --git a/packages/o-editor/build.sh b/packages/o-editor/build.sh index 0a4639c3a..5d90b0786 100644 --- a/packages/o-editor/build.sh +++ b/packages/o-editor/build.sh @@ -16,7 +16,6 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/xyproto/o cd "$GOPATH"/src/github.com/xyproto/o - termux_go_get -d -v go build } diff --git a/packages/obfs4proxy/build.sh b/packages/obfs4proxy/build.sh index 9b07f38d4..a800c2358 100644 --- a/packages/obfs4proxy/build.sh +++ b/packages/obfs4proxy/build.sh @@ -15,7 +15,7 @@ TERMUX_PKG_DEPENDS="tor" termux_step_make() { termux_setup_golang cd "$TERMUX_PKG_SRCDIR"/obfs4proxy - termux_go_get -d ./... + go get -d ./... go build . } diff --git a/packages/proton-bridge/build.sh b/packages/proton-bridge/build.sh index 91f35c455..bacca8721 100644 --- a/packages/proton-bridge/build.sh +++ b/packages/proton-bridge/build.sh @@ -6,16 +6,12 @@ TERMUX_PKG_SRCURL=https://github.com/ProtonMail/proton-bridge.git TERMUX_PKG_GIT_BRANCH=br-$TERMUX_PKG_VERSION TERMUX_PKG_MAINTAINER="Radomír Polách " TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686" -TERMUX_PKG_BUILD_IN_SRC=true - -termux_step_make() { - termux_setup_golang - export GOPATH=$TERMUX_PKG_SRCDIR/go - go mod tidy - # TODO: Cache go dependencies `termux_go_deps` after new release of proton-bridge - make build-nogui -} termux_step_make_install() { + termux_setup_golang + export GOPATH=$TERMUX_PKG_BUILDDIR + export BUILDDIR=$TERMUX_PREFIX/bin + cd $TERMUX_PKG_SRCDIR + make build-nogui install -Dm700 proton-bridge "$TERMUX_PREFIX"/bin/proton-bridge } diff --git a/packages/pup/build.sh b/packages/pup/build.sh index 8d977f708..368058fa7 100644 --- a/packages/pup/build.sh +++ b/packages/pup/build.sh @@ -18,7 +18,7 @@ termux_step_make() { cd "${GOPATH}/src/github.com/ericchiang/pup" export GO111MODULE=off - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh index bdd7226a0..7e2f93b45 100644 --- a/packages/rclone/build.sh +++ b/packages/rclone/build.sh @@ -16,7 +16,6 @@ termux_step_make_install() { ln -sf "$PWD" .gopath/src/github.com/rclone/rclone export GOPATH="$PWD/.gopath" - termux_go_get go build -v -ldflags "-X github.com/rclone/rclone/fs.Version=${TERMUX_PKG_VERSION}-termux" -tags noselfupdate -o rclone # XXX: Fix read-only files which prevents removal of src dir. diff --git a/packages/restic/build.sh b/packages/restic/build.sh index d8d6b6a3c..45fc204da 100644 --- a/packages/restic/build.sh +++ b/packages/restic/build.sh @@ -25,7 +25,6 @@ termux_step_make() { rm -f ./restic ) - termux_go_get -d -v go build -ldflags "-X 'main.version=${TERMUX_PKG_VERSION}'" ./cmd/... } diff --git a/packages/rush/build.sh b/packages/rush/build.sh index f98a62233..1c62e800d 100644 --- a/packages/rush/build.sh +++ b/packages/rush/build.sh @@ -17,7 +17,7 @@ termux_step_make_install() { cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/shenwei356/rush" cd "${GOPATH}/src/github.com/shenwei356/rush" go mod init rush - termux_go_get -d -v + go get -d -v go install install -Dm700 $TERMUX_PKG_BUILDDIR/bin/*/rush $TERMUX_PREFIX/bin/ diff --git a/packages/shell2http/build.sh b/packages/shell2http/build.sh index e1a92a3e2..ca5b3b878 100644 --- a/packages/shell2http/build.sh +++ b/packages/shell2http/build.sh @@ -17,7 +17,7 @@ termux_step_make() { cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http" cd "${GOPATH}/src/github.com/msoap/shell2http" go mod init - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/shiori/build.sh b/packages/shiori/build.sh index 7503df2de..b7911a4e2 100644 --- a/packages/shiori/build.sh +++ b/packages/shiori/build.sh @@ -16,7 +16,7 @@ termux_step_make() { mkdir -p "$TERMUX_PREFIX"/share/doc/shiori cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/go-shiori/shiori cd "$GOPATH"/src/github.com/go-shiori/shiori/ - termux_go_get -d -v + go get -d -v go build } diff --git a/packages/slides/build.sh b/packages/slides/build.sh index d8274e30b..cfc84a8bb 100644 --- a/packages/slides/build.sh +++ b/packages/slides/build.sh @@ -5,11 +5,12 @@ TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=0.4.1 TERMUX_PKG_SRCURL=https://github.com/maaslalani/slides/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=f1c3494ec8d52ebb0351f1722d60ad4f4dd56b1f649130adfe59db8c9ffaeae2 -TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang - termux_go_get + + export GOPATH=$TERMUX_PKG_BUILDDIR + cd "$TERMUX_PKG_SRCDIR" make build } diff --git a/packages/sops/build.sh b/packages/sops/build.sh index f6899431b..dc19c67e8 100644 --- a/packages/sops/build.sh +++ b/packages/sops/build.sh @@ -13,7 +13,7 @@ termux_step_make_install() { mkdir -p "${GOPATH}/src/go.mozilla.org" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/go.mozilla.org/sops" cd "${GOPATH}/src/go.mozilla.org/sops" || return 9 - termux_go_get -d -v + go get -d -v make install install -Dm700 "${GOPATH}/bin/"*/sops "${TERMUX_PREFIX}/bin/sops" diff --git a/packages/syncthing/build.sh b/packages/syncthing/build.sh index 89fc2fbf7..62566c5c4 100644 --- a/packages/syncthing/build.sh +++ b/packages/syncthing/build.sh @@ -27,8 +27,7 @@ termux_step_make(){ export GO_ARCH=$GOARCH export _CC=$CC unset GOOS GOARCH CC - - termux_go_get -d -v + # Now file structure is same as go get etc. go build build.go export CC=$_CC diff --git a/packages/teleport-tsh/build.sh b/packages/teleport-tsh/build.sh index de92b1b55..7f626c797 100644 --- a/packages/teleport-tsh/build.sh +++ b/packages/teleport-tsh/build.sh @@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/gravitational/teleport TERMUX_PKG_DESCRIPTION="Secure Access for Developers that doesn't get in the way" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=6.2.7 +TERMUX_PKG_VERSION=5.1.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SKIP_SRC_EXTRACT=true termux_step_make_install() { @@ -16,6 +17,6 @@ termux_step_make_install() { cd teleport git checkout "v$TERMUX_PKG_VERSION" - termux_go_get + make $BUILDDIR/tsh } diff --git a/packages/tweego/build.sh b/packages/tweego/build.sh index 4c4e40ff1..c39392db7 100644 --- a/packages/tweego/build.sh +++ b/packages/tweego/build.sh @@ -15,7 +15,7 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tmedwards/tweego cd "$GOPATH"/src/github.com/tmedwards/tweego - termux_go_get -d -v github.com/tmedwards/tweego + go get -d -v github.com/tmedwards/tweego go build } diff --git a/packages/vegeta/build.sh b/packages/vegeta/build.sh index c717ed3d3..79c9b0d8b 100644 --- a/packages/vegeta/build.sh +++ b/packages/vegeta/build.sh @@ -15,7 +15,6 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tsenart/vegeta cd "$GOPATH"/src/github.com/tsenart/vegeta - termux_go_get -d -v go build } diff --git a/packages/virustotal-cli/build.sh b/packages/virustotal-cli/build.sh index 544792c4b..c6f10a593 100644 --- a/packages/virustotal-cli/build.sh +++ b/packages/virustotal-cli/build.sh @@ -17,7 +17,6 @@ termux_step_make() { cd "$GOPATH"/src/github.com/VirusTotal/vt-cli - # TODO: Cache Golang dependencies go build \ -ldflags "-X github.com/VirusTotal/vt-cli/cmd.Version=$TERMUX_PKG_VERSION" \ -o "$TERMUX_PREFIX"/bin/vt-cli \ diff --git a/packages/wuzz/build.sh b/packages/wuzz/build.sh index 0c25dc6b4..71790ef1f 100644 --- a/packages/wuzz/build.sh +++ b/packages/wuzz/build.sh @@ -14,7 +14,6 @@ termux_step_make() { ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/asciimoo/wuzz cd "$GOPATH"/src/github.com/asciimoo/wuzz - termux_go_get -d -v go build } diff --git a/packages/youtubedr/build.sh b/packages/youtubedr/build.sh index 9d7ec14dd..03f4c704f 100644 --- a/packages/youtubedr/build.sh +++ b/packages/youtubedr/build.sh @@ -14,7 +14,7 @@ termux_step_make() { mkdir -p "${GOPATH}/src/github.com/kkdai/" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube" cd "${GOPATH}/src/github.com/kkdai/youtube/" - termux_go_get -d -v + go get -d -v cd cmd/youtubedr go build . } diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index a8ce2ec31..79cb67967 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -40,22 +40,3 @@ termux_setup_golang() { export GOROOT="$TERMUX_PREFIX/lib/go" fi } - -termux_go_get() { - if $TERMUX_ON_DEVICE_BUILD; then - if [ -z ${GOPATH+x} ]; then - if $TERMUX_PKG_BUILD_IN_SRC; then - export GOPATH=$TERMUX_PKG_SRCDIR/go - else - export GOPATH=$TERMUX_PKG_BUILDDIR/go - fi - fi - if [ -d $TERMUX_PKG_CACHEDIR/go ]; then - cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r - fi - go get "$@" - cp $GOPATH $TERMUX_PKG_CACHEDIR/go -r - else - go get "$@" - fi -}