From 994283278887b4a7d84ce73f193e0b5ad32d6449 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sun, 4 Jul 2021 22:03:33 +0530 Subject: [PATCH 01/80] Cache depeneencies for `aerc` on device builds --- packages/aerc/build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/aerc/build.sh b/packages/aerc/build.sh index 5756b2f37..fc41d08fd 100644 --- a/packages/aerc/build.sh +++ b/packages/aerc/build.sh @@ -10,4 +10,14 @@ TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { termux_setup_golang + if $TERMUX_ON_DEVICE_BUILD; then + export GOPATH=$TERMUX_PKG_SRCDIR/go + if [ -d $TERMUX_PKG_CACHEDIR/go ]; then + cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r + else + go get + cp $TERMUX_PKG_SRCDIR/go $TERMUX_PKG_CACHEDIR/go -r + fi + + fi } From b109e79c2cdc870ebb8313516f9bfcec4622a310 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 08:36:22 +0530 Subject: [PATCH 02/80] Run `go get` after restoring cache While updating packages, dependency versions may have changed --- packages/aerc/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aerc/build.sh b/packages/aerc/build.sh index fc41d08fd..dd6029e99 100644 --- a/packages/aerc/build.sh +++ b/packages/aerc/build.sh @@ -14,10 +14,10 @@ termux_step_pre_configure() { export GOPATH=$TERMUX_PKG_SRCDIR/go if [ -d $TERMUX_PKG_CACHEDIR/go ]; then cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r + go get else go get cp $TERMUX_PKG_SRCDIR/go $TERMUX_PKG_CACHEDIR/go -r fi - fi } From 40aef7e5ea5c4d7c30b3316411840ed202e13d95 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 09:22:16 +0530 Subject: [PATCH 03/80] Move golang cache logic out of build.sh --- packages/aerc/build.sh | 11 +---------- scripts/build/setup/termux_setup_golang.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/aerc/build.sh b/packages/aerc/build.sh index dd6029e99..b989b12ee 100644 --- a/packages/aerc/build.sh +++ b/packages/aerc/build.sh @@ -10,14 +10,5 @@ TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { termux_setup_golang - if $TERMUX_ON_DEVICE_BUILD; then - export GOPATH=$TERMUX_PKG_SRCDIR/go - if [ -d $TERMUX_PKG_CACHEDIR/go ]; then - cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r - go get - else - go get - cp $TERMUX_PKG_SRCDIR/go $TERMUX_PKG_CACHEDIR/go -r - fi - fi + termux_go_get } diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index 79cb67967..c1673bd1f 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -40,3 +40,23 @@ termux_setup_golang() { export GOROOT="$TERMUX_PREFIX/lib/go" fi } + +termux_go_get() { + if $TERMUX_ON_DEVICE_BUILD; then + if $TERMUX_PKG_BUILD_IN_SRC; then + export GOPATH=$TERMUX_PKG_SRCDIR/go + else + export GOPATH=$TERMUX_PKG_BUILDDIR/go + fi + if [ -d $TERMUX_PKG_CACHEDIR/go ]; then + cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r + go get "$@" + else + go get "$@" + cp $GOPATH $TERMUX_PKG_CACHEDIR/go -r + fi + go get "$@" + else + go get "$@" + fi +} From 92f1afaa549fd4c50679f312254ddb82794e2cbe Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 09:26:19 +0530 Subject: [PATCH 04/80] Fix go cache reliability in some edge cases --- scripts/build/setup/termux_setup_golang.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index c1673bd1f..b8032973d 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -50,12 +50,9 @@ termux_go_get() { fi if [ -d $TERMUX_PKG_CACHEDIR/go ]; then cp $TERMUX_PKG_CACHEDIR/go $GOPATH -r - go get "$@" - else - go get "$@" - cp $GOPATH $TERMUX_PKG_CACHEDIR/go -r fi go get "$@" + cp $GOPATH $TERMUX_PKG_CACHEDIR/go -r else go get "$@" fi From e3b4b4fe404d3ae7c1fdcb4ee804f50e0855d673 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 09:53:22 +0530 Subject: [PATCH 05/80] `age`: Cache Golang dependencies --- packages/age/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/age/build.sh b/packages/age/build.sh index 91fceb56f..1756e8b21 100644 --- a/packages/age/build.sh +++ b/packages/age/build.sh @@ -5,12 +5,11 @@ 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 - export GOPATH=$TERMUX_PKG_BUILDDIR - - cd $TERMUX_PKG_SRCDIR + termux_go_get go build ./cmd/age go build ./cmd/age-keygen } From 8c29ad042ec89b86664db6bbaadcd85757e82e89 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 11:34:25 +0530 Subject: [PATCH 06/80] `hugo`: Cache Golang dependencies --- packages/hugo/build.sh | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index 58ef3d0f0..081f77a5a 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -6,36 +6,22 @@ TERMUX_PKG_VERSION=0.84.4 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=d8711de4b34ef602efa4805648efcc5c8b3881138db85b16efc025b5b08fb209 TERMUX_PKG_DEPENDS="libc++" +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang - export GOPATH=$TERMUX_PKG_BUILDDIR - - cd $TERMUX_PKG_SRCDIR + termux_go_get go build \ - -o "$TERMUX_PREFIX/bin/hugo" \ - -tags "linux extended" \ + -o hugo \ main.go - # "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() { + install -Dm700 -t "$TERMUX_PREFIX"/bin "$TERMUX_PKG_SRCDIR"/hugo mkdir -p $TERMUX_PREFIX/share/{bash-completion/completions,man/man1} - $TERMUX_PKG_BUILDDIR/hugo gen autocomplete \ + ./hugo gen autocomplete \ --completionfile=$TERMUX_PREFIX/share/bash-completion/completions/hugo - $TERMUX_PKG_BUILDDIR/hugo gen man \ + ./hugo gen man \ --dir=$TERMUX_PREFIX/share/man/man1/ } From 55ebd7764546262bcf879c2a35d247b15fdf7623 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 12:10:22 +0530 Subject: [PATCH 07/80] Fix build errors --- packages/hugo/build.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index 081f77a5a..ce3534c41 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -14,14 +14,27 @@ termux_step_make() { go build \ -o hugo \ main.go + if ! $TERMUX_ON_DEVICE_BUILD; then + chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg + unset GOOS GOARCH CGO_LDFLAGS + unset C CXX CFLAGS CXXFLAGS LDFLAGS + go build \ + -o hugo-host \ + main.go + fi } 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 \ + $HUGO gen autocomplete \ --completionfile=$TERMUX_PREFIX/share/bash-completion/completions/hugo - ./hugo gen man \ + $HUGO gen man \ --dir=$TERMUX_PREFIX/share/man/man1/ } From b8037128f3f0a4193915fd44da572e4eee385aad Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 12:22:15 +0530 Subject: [PATCH 08/80] `termux_go_get`: Do not override `$GOPATH` --- packages/hugo/build.sh | 1 + scripts/build/setup/termux_setup_golang.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index ce3534c41..73e9fd80e 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -10,6 +10,7 @@ TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang + export GOPATH=$TERMUX_PKG_SRCDIR/go termux_go_get go build \ -o hugo \ diff --git a/scripts/build/setup/termux_setup_golang.sh b/scripts/build/setup/termux_setup_golang.sh index b8032973d..a8ce2ec31 100644 --- a/scripts/build/setup/termux_setup_golang.sh +++ b/scripts/build/setup/termux_setup_golang.sh @@ -43,10 +43,12 @@ termux_setup_golang() { termux_go_get() { if $TERMUX_ON_DEVICE_BUILD; then - if $TERMUX_PKG_BUILD_IN_SRC; then - export GOPATH=$TERMUX_PKG_SRCDIR/go - else - export GOPATH=$TERMUX_PKG_BUILDDIR/go + 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 From 07fe73079c22f0f557e217d4441b16103e75530d Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 12:54:43 +0530 Subject: [PATCH 09/80] `hugo`: hostbuild with linux extended tags --- packages/hugo/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index 73e9fd80e..fe4d1c48e 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -21,6 +21,7 @@ termux_step_make() { unset C CXX CFLAGS CXXFLAGS LDFLAGS go build \ -o hugo-host \ + -tags "linux extended" \ main.go fi } From f450d386ead7a861a577cd218797806452062de1 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 13:34:36 +0530 Subject: [PATCH 10/80] `hugo`: Fix typo and also build errors --- packages/hugo/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index fe4d1c48e..be3149663 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -18,10 +18,9 @@ termux_step_make() { if ! $TERMUX_ON_DEVICE_BUILD; then chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg unset GOOS GOARCH CGO_LDFLAGS - unset C CXX CFLAGS CXXFLAGS LDFLAGS + unset CC CXX CFLAGS CXXFLAGS LDFLAGS go build \ -o hugo-host \ - -tags "linux extended" \ main.go fi } From d3b464f0bd30149cc90d3fdf198875c19bf112a1 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 13:48:11 +0530 Subject: [PATCH 11/80] `flyctl`: Cache Golang dependencies --- packages/flyctl/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/flyctl/build.sh b/packages/flyctl/build.sh index 696a22632..21798f9a7 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 - go get + termux_go_get chmod 777 $GOPATH -R } From 4df334f2e51aeb3b3dcf4f2c1142e1c6560ebd9c Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 13:54:49 +0530 Subject: [PATCH 12/80] `germaniu.`: Bump and cache go dependencies --- packages/germanium/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/germanium/build.sh b/packages/germanium/build.sh index 0b65fa549..2868a0348 100644 --- a/packages/germanium/build.sh +++ b/packages/germanium/build.sh @@ -2,13 +2,14 @@ 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.1.0 +TERMUX_PKG_VERSION=1.2.0 TERMUX_PKG_SRCURL=https://github.com/matsuyoshi30/germanium/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=afd39dc311b0c5226a9a197c07b13d52c6fc2557543951f4ba98910c19824881 +TERMUX_PKG_SHA256=9a2b190ea7e8211ed03fa6860aea73ef06228266d7b6e4d32df2031fdf1c9606 TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang + termux_go_get make build } From 2fa1dfb56e3fffebeb7b76db7e683baf07ea376d Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 17:08:25 +0530 Subject: [PATCH 13/80] `direnv`: Cache Golang dependencies --- packages/direnv/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/direnv/build.sh b/packages/direnv/build.sh index 8d1607df3..00164c945 100644 --- a/packages/direnv/build.sh +++ b/packages/direnv/build.sh @@ -9,6 +9,7 @@ TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang + termux_go_get make } From ff987a68c780c2d6ad34e6b5a52994fb6c6649bf Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 17:08:58 +0530 Subject: [PATCH 14/80] `lazygit`: Cache Golang dependencies --- packages/lazygit/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lazygit/build.sh b/packages/lazygit/build.sh index d97879ce4..904bc6ccf 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" - go get -d -v + termux_go_get -d -v go build } From 13466285ae53de15c1d2599eafac95bea95e5ff1 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 17:09:51 +0530 Subject: [PATCH 15/80] `pup`: Cache Golang dependencies --- packages/pup/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pup/build.sh b/packages/pup/build.sh index 368058fa7..8d977f708 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 - go get -d -v + termux_go_get -d -v go build } From 2be2df12246e35dbe3c64546c360b99499bab3f1 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 17:10:06 +0530 Subject: [PATCH 16/80] `slides`: Cache Golang dependencies --- packages/slides/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/slides/build.sh b/packages/slides/build.sh index 8f981b105..84f8357de 100644 --- a/packages/slides/build.sh +++ b/packages/slides/build.sh @@ -5,12 +5,11 @@ TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=0.4.0 TERMUX_PKG_SRCURL=https://github.com/maaslalani/slides/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=320285f179c4c2de7810f945f6c27c1d57d97f3b4ee322867248f7f1a7c06adf +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { termux_setup_golang - - export GOPATH=$TERMUX_PKG_BUILDDIR - cd "$TERMUX_PKG_SRCDIR" + termux_go_get make build } From 529731afc85eff951fa49b5f7418b7a138e98fdb Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:21:57 +0530 Subject: [PATCH 17/80] `gh`: Cache Golang dependencies --- packages/gh/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gh/build.sh b/packages/gh/build.sh index 7a0551c99..0276237de 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 - go get -d -v + termux_go_get -d -v go build -ldflags="-X github.com/cli/cli/internal/build.Version=$TERMUX_PKG_VERSION" } From bef17c470da470fe049ec7ea25e4ff1cea38f0fb Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:23:46 +0530 Subject: [PATCH 18/80] `antibody`: Cache Golang dependencies --- packages/antibody/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/antibody/build.sh b/packages/antibody/build.sh index 84aefb12f..a577c7c6b 100644 --- a/packages/antibody/build.sh +++ b/packages/antibody/build.sh @@ -14,6 +14,7 @@ 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 } From dbf6b15ea8a57f817c6b22346d0bdf7558f68b10 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:31:25 +0530 Subject: [PATCH 19/80] `aptly`: Cache Golang dependencies --- packages/aptly/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/aptly/build.sh b/packages/aptly/build.sh index 37b0d0f6f..3b6ef0791 100644 --- a/packages/aptly/build.sh +++ b/packages/aptly/build.sh @@ -17,6 +17,7 @@ termux_step_make() { go mod init go mod vendor + termux_go_get -d -v make install VERSION=$TERMUX_PKG_VERSION } From aab1187d930b9f80fe4a5f15547109668508a6ae Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:32:16 +0530 Subject: [PATCH 20/80] `brook`: Cache Golang dependencies --- packages/brook/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/brook/build.sh b/packages/brook/build.sh index d052333d3..0e144c544 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 - go get -d -v + termux_go_get -d -v go build -o brook } From 237824baa453e6d7f8dc9c9b9adc1dde351a4e66 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:35:05 +0530 Subject: [PATCH 21/80] `caddy`: Cache Golang dependencies --- packages/caddy/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/caddy/build.sh b/packages/caddy/build.sh index 3cef6a373..fa5990016 100644 --- a/packages/caddy/build.sh +++ b/packages/caddy/build.sh @@ -15,6 +15,7 @@ termux_step_make() { cd $GOPATH/src/github.com/caddyserver/caddy/cmd/caddy export GO111MODULE=on + termux_go_get -d -v go build -v . } From b438bd0d76c0dbd2c80e91a2203862f91cc0f426 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:35:58 +0530 Subject: [PATCH 22/80] `chezmoi`: Cache Golang dependencies --- packages/chezmoi/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/chezmoi/build.sh b/packages/chezmoi/build.sh index 1b3751c9f..0d57f6705 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" - go get -d -v + termux_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}" . } From f4521b29f4cdea258f37a4837e4960dbf4eb7596 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:43:45 +0530 Subject: [PATCH 23/80] `croc`: Cache Golang dependencies --- packages/croc/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/croc/build.sh b/packages/croc/build.sh index 00f1f0c8b..2839d1b35 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 } From 36a483a863d67ac48c79ef61a5153612a9ee3ab0 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:44:30 +0530 Subject: [PATCH 24/80] `delve`: Cache Golang dependencies --- packages/delve/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/delve/build.sh b/packages/delve/build.sh index 2b120f252..dcc6f0e6c 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/ - go get -d -v + termux_go_get -d -v go build } From 3f18f982485cac674236cc44b234eed342b87a81 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:45:09 +0530 Subject: [PATCH 25/80] `duf`: Cache Golang dependencies --- packages/duf/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/duf/build.sh b/packages/duf/build.sh index d43a3d97b..0ef68b6f7 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" - go get -d -v + termux_go_get -d -v go build } From d6058f0ffb0130a7198031a9b0b1fefc67a17159 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:46:04 +0530 Subject: [PATCH 26/80] `elvish`: Cache Golang dependencies --- packages/elvish/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/elvish/build.sh b/packages/elvish/build.sh index a6be92713..954563dde 100644 --- a/packages/elvish/build.sh +++ b/packages/elvish/build.sh @@ -14,6 +14,7 @@ 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 } From cd095dd510ca0b8aacfe6da33def4ff4c7446f8c Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:47:15 +0530 Subject: [PATCH 27/80] `fzf`: Cache Golang dependencies --- packages/fzf/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh index 6893e48d4..53905d71e 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 - go get -d -v github.com/junegunn/fzf + termux_go_get -d -v github.com/junegunn/fzf go build } From d36092ca64607fdeeaa4e257149e75171cdace66 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:48:12 +0530 Subject: [PATCH 28/80] `gbt`: Cache Golang dependencies --- packages/gbt/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gbt/build.sh b/packages/gbt/build.sh index 50e7ee553..52fa13e73 100644 --- a/packages/gbt/build.sh +++ b/packages/gbt/build.sh @@ -19,6 +19,7 @@ termux_step_make_install() { go mod init gbt go mod tidy + termux_go_get -d -v go build -ldflags="-s -w -X main.version=$TERMUX_PKG_VERSION -X main.build=${_COMMIT::6}" -o $TERMUX_PREFIX/bin/gbt github.com/jtyr/gbt/cmd/gbt mkdir -p $TERMUX_PREFIX/{doc/gbt,share/gbt} From 85fecd2f10a5f778086af163ff3c3df62f04ecc7 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:50:27 +0530 Subject: [PATCH 29/80] `glow`: Cache Golang dependencies --- packages/glow/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/glow/build.sh b/packages/glow/build.sh index 0b8a5f0bf..3ff33489d 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" - go get -d -v + termux_go_get -d -v go build } From 9448d15604a95831bba539c1599af92aadbc46d7 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:57:55 +0530 Subject: [PATCH 30/80] `tweego`: Cache Golang dependencies --- packages/tweego/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tweego/build.sh b/packages/tweego/build.sh index c39392db7..4c4e40ff1 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 - go get -d -v github.com/tmedwards/tweego + termux_go_get -d -v github.com/tmedwards/tweego go build } From b5950892b5e66113ea6f76d3ba8f240882387edf Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 18:58:39 +0530 Subject: [PATCH 31/80] `sops`: Cache Golang dependencies --- packages/sops/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sops/build.sh b/packages/sops/build.sh index dc19c67e8..f6899431b 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 - go get -d -v + termux_go_get -d -v make install install -Dm700 "${GOPATH}/bin/"*/sops "${TERMUX_PREFIX}/bin/sops" From c0c72dd56a3cd2315c15b661fba7bbb699c279ca Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 19:00:17 +0530 Subject: [PATCH 32/80] `syncthing`: Cache Golang dependencies --- packages/syncthing/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/syncthing/build.sh b/packages/syncthing/build.sh index 0e17af630..5057ff9b7 100644 --- a/packages/syncthing/build.sh +++ b/packages/syncthing/build.sh @@ -27,7 +27,8 @@ 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 From b81aae096b80d73f40652916d1a227a7d60f4c2c Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 19:01:13 +0530 Subject: [PATCH 33/80] `shiori`: Cache Golang dependencies --- packages/shiori/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shiori/build.sh b/packages/shiori/build.sh index b7911a4e2..7503df2de 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/ - go get -d -v + termux_go_get -d -v go build } From 9980c8bce60af66c75ebb9489977875860c4f1b0 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 19:03:50 +0530 Subject: [PATCH 34/80] `restic`: Cache Golang dependencies --- packages/restic/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/restic/build.sh b/packages/restic/build.sh index 45fc204da..d8d6b6a3c 100644 --- a/packages/restic/build.sh +++ b/packages/restic/build.sh @@ -25,6 +25,7 @@ termux_step_make() { rm -f ./restic ) + termux_go_get -d -v go build -ldflags "-X 'main.version=${TERMUX_PKG_VERSION}'" ./cmd/... } From a6ebde004c40f3270a373d9055b93ec45165ec23 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 19:04:55 +0530 Subject: [PATCH 35/80] `lf`: Cache Golang dependencies --- packages/lf/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/lf/build.sh b/packages/lf/build.sh index 3fde8a909..1f6835050 100644 --- a/packages/lf/build.sh +++ b/packages/lf/build.sh @@ -13,6 +13,7 @@ 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 } From 98149884c09d42fdca53cf422dee9e9bbb5e009c Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 19:08:28 +0530 Subject: [PATCH 36/80] `proton-bridge`: Cache Golang dependencies --- packages/proton-bridge/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/proton-bridge/build.sh b/packages/proton-bridge/build.sh index bacca8721..05e2765de 100644 --- a/packages/proton-bridge/build.sh +++ b/packages/proton-bridge/build.sh @@ -12,6 +12,7 @@ termux_step_make_install() { export GOPATH=$TERMUX_PKG_BUILDDIR export BUILDDIR=$TERMUX_PREFIX/bin cd $TERMUX_PKG_SRCDIR + termux_go_get make build-nogui install -Dm700 proton-bridge "$TERMUX_PREFIX"/bin/proton-bridge } From e021b590b3fc09eddd9ab9726f5083e1d92db339 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 20:20:55 +0530 Subject: [PATCH 37/80] `gbt`: Do not cache Golang dependencies --- packages/gbt/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gbt/build.sh b/packages/gbt/build.sh index 52fa13e73..50e7ee553 100644 --- a/packages/gbt/build.sh +++ b/packages/gbt/build.sh @@ -19,7 +19,6 @@ termux_step_make_install() { go mod init gbt go mod tidy - termux_go_get -d -v go build -ldflags="-s -w -X main.version=$TERMUX_PKG_VERSION -X main.build=${_COMMIT::6}" -o $TERMUX_PREFIX/bin/gbt github.com/jtyr/gbt/cmd/gbt mkdir -p $TERMUX_PREFIX/{doc/gbt,share/gbt} From b520cf0259d6c2e00284ef7838d819fcd9873b0a Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 21:45:16 +0530 Subject: [PATCH 38/80] `proton-bridge`: Run `go mod tidy` before getting dependencies --- packages/proton-bridge/build.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/proton-bridge/build.sh b/packages/proton-bridge/build.sh index 05e2765de..00e2d9349 100644 --- a/packages/proton-bridge/build.sh +++ b/packages/proton-bridge/build.sh @@ -6,13 +6,16 @@ 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 + termux_go_get -d -v + make build-nogui +} termux_step_make_install() { - termux_setup_golang - export GOPATH=$TERMUX_PKG_BUILDDIR - export BUILDDIR=$TERMUX_PREFIX/bin - cd $TERMUX_PKG_SRCDIR - termux_go_get - make build-nogui install -Dm700 proton-bridge "$TERMUX_PREFIX"/bin/proton-bridge } From 1ef9ed16d59b3b98b0d290d553771ea99ea214db Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Mon, 5 Jul 2021 22:15:27 +0530 Subject: [PATCH 39/80] `proton-bridge`: Do not cache Golang dependencies for now --- packages/proton-bridge/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/proton-bridge/build.sh b/packages/proton-bridge/build.sh index 00e2d9349..91f35c455 100644 --- a/packages/proton-bridge/build.sh +++ b/packages/proton-bridge/build.sh @@ -12,7 +12,7 @@ termux_step_make() { termux_setup_golang export GOPATH=$TERMUX_PKG_SRCDIR/go go mod tidy - termux_go_get -d -v + # TODO: Cache go dependencies `termux_go_deps` after new release of proton-bridge make build-nogui } From c676093cf6b0a5a9d1be7a7480128d9efd4e4b42 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:39:46 +0530 Subject: [PATCH 40/80] `geth`: Cache Golang dependencies --- packages/geth/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/geth/build.sh b/packages/geth/build.sh index c5dc07917..669b02735 100644 --- a/packages/geth/build.sh +++ b/packages/geth/build.sh @@ -14,6 +14,7 @@ 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 From e0d69cae4275d7b7a4a955b0a27795b528933d89 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:42:14 +0530 Subject: [PATCH 41/80] `git-lfs`: Cache Golang dependencies --- packages/git-lfs/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/git-lfs/build.sh b/packages/git-lfs/build.sh index 5acf7d742..bb09dfec1 100644 --- a/packages/git-lfs/build.sh +++ b/packages/git-lfs/build.sh @@ -15,6 +15,7 @@ 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 } From b930bd7f909677cc52d7410ea3e7da5c4e3deb95 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:43:59 +0530 Subject: [PATCH 42/80] `gitea`: Cache Golang dependencies --- packages/gitea/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gitea/build.sh b/packages/gitea/build.sh index 6f8685ec7..b326159a2 100644 --- a/packages/gitea/build.sh +++ b/packages/gitea/build.sh @@ -20,6 +20,7 @@ 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 } From 6f2e2aa4b8e680b0a9927028800980fb5c62bd52 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:46:50 +0530 Subject: [PATCH 43/80] `gogs`: Cache Golang dependencies --- packages/gogs/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gogs/build.sh b/packages/gogs/build.sh index e1ed43b80..83d778421 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 - go get -u github.com/kevinburke/go-bindata/... + termux_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 } From ebf7d0958d5a6499210b7cd35853d8dc184e83a6 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:47:43 +0530 Subject: [PATCH 44/80] `gopass`: Cache Golang dependencies --- packages/gopass/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gopass/build.sh b/packages/gopass/build.sh index 1a86ae529..770f2540a 100644 --- a/packages/gopass/build.sh +++ b/packages/gopass/build.sh @@ -18,6 +18,7 @@ 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'" + termux_go_get -d -v install -Dm700 \ ./src/github.com/gopasspw/gopass/gopass \ "$TERMUX_PREFIX"/bin/gopass From 7f9d3c00be99343fa20feed2771e7a81eaf7b56c Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:49:07 +0530 Subject: [PATCH 45/80] `gotty`: Cache Golang dependencies --- packages/gotty/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gotty/build.sh b/packages/gotty/build.sh index 5b4070b06..f92a82c3a 100644 --- a/packages/gotty/build.sh +++ b/packages/gotty/build.sh @@ -17,6 +17,7 @@ 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 } From 1b865424ceaa449ced811d877725442d1279c54c Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:50:15 +0530 Subject: [PATCH 46/80] `helm`: Cache Golang dependencies --- packages/helm/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/helm/build.sh b/packages/helm/build.sh index f05a9784b..b775e7ce8 100644 --- a/packages/helm/build.sh +++ b/packages/helm/build.sh @@ -12,6 +12,7 @@ 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" + termux_go_get -d -v make } From 43acfd21d3a1f06ad7a143c3d88f3a85e7a16e3e Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:51:29 +0530 Subject: [PATCH 47/80] `hub`: Cache Golang dependencies --- packages/hub/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/hub/build.sh b/packages/hub/build.sh index 5bdfa6cc8..9801007de 100644 --- a/packages/hub/build.sh +++ b/packages/hub/build.sh @@ -18,6 +18,7 @@ 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 } @@ -30,6 +31,7 @@ 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 From 745a61f21925a1253d47e27d868747f066851d97 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:52:26 +0530 Subject: [PATCH 48/80] `hydroxide`: Cache Golang dependencies --- packages/hydroxide/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hydroxide/build.sh b/packages/hydroxide/build.sh index 731cb9e8a..3c360e923 100644 --- a/packages/hydroxide/build.sh +++ b/packages/hydroxide/build.sh @@ -12,6 +12,7 @@ termux_step_make() { export GOPATH=$TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_SRCDIR + termux_go_get go build ./cmd/hydroxide } From eaad52ef4b0ba32d4af02a53653bd2b2f81e0120 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:53:21 +0530 Subject: [PATCH 49/80] `ipfs`: Cache Golang dependencies --- packages/ipfs/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ipfs/build.sh b/packages/ipfs/build.sh index 8c951085a..80499ea78 100644 --- a/packages/ipfs/build.sh +++ b/packages/ipfs/build.sh @@ -25,7 +25,8 @@ 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: From 906c841dab6089e8dfe86e32f21e4c2cfa82e636 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:54:27 +0530 Subject: [PATCH 50/80] `jfrog-cli`: Cache Golang dependencies --- packages/jfrog-cli/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/jfrog-cli/build.sh b/packages/jfrog-cli/build.sh index edc87f4a2..410d43c47 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,7 +25,6 @@ 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 From 7cfd21460c04cb0cc6cd8ee85ad04b741b3ff349 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:55:24 +0530 Subject: [PATCH 51/80] `k9s`: Cache Golang dependencies --- packages/k9s/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/k9s/build.sh b/packages/k9s/build.sh index 82655b592..8ad3602a0 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" - go get -d -v + termux_go_get -d -v go build } From 6462ad200d653a56f796e91540be508d54d1e1a8 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:56:06 +0530 Subject: [PATCH 52/80] `keybase`: Cache Golang dependencies --- packages/keybase/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 06ba5fc75..5f7317be3 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -17,6 +17,7 @@ termux_step_make_install() { ln -sf "$PWD" .gopath/src/github.com/keybase/client export GOPATH="$PWD/.gopath" + termux_go_get -d -v go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase go build -v -tags 'production' -o kbfsfusebin github.com/keybase/client/go/kbfs/kbfsfuse From 38644b9a5e109afe89c85aebbd5b6c42426fb156 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:57:15 +0530 Subject: [PATCH 53/80] `kubectl`: Cache Golang dependencies --- packages/kubectl/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kubectl/build.sh b/packages/kubectl/build.sh index 862dbe072..08ee83e85 100644 --- a/packages/kubectl/build.sh +++ b/packages/kubectl/build.sh @@ -34,6 +34,7 @@ termux_step_make() { #rm -rf "$TERMUX_PKG_SRCDIR"/_output cd "$TERMUX_PKG_SRCDIR"/cmd/kubectl + termux_go_get -d -v go build . } From 31b5ca4353bff9edbf9e38d7c74650c410de2619 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:57:55 +0530 Subject: [PATCH 54/80] `vegeta`: Cache Golang dependencies --- packages/vegeta/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vegeta/build.sh b/packages/vegeta/build.sh index 79c9b0d8b..c717ed3d3 100644 --- a/packages/vegeta/build.sh +++ b/packages/vegeta/build.sh @@ -15,6 +15,7 @@ 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 } From aa94aaf5ff5116cdc0088dc5e2dc78ae6860b5d5 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:58:41 +0530 Subject: [PATCH 55/80] `virustotal-cli`: Cache Golang dependencies --- packages/virustotal-cli/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/virustotal-cli/build.sh b/packages/virustotal-cli/build.sh index c6f10a593..a10c4b84d 100644 --- a/packages/virustotal-cli/build.sh +++ b/packages/virustotal-cli/build.sh @@ -17,6 +17,7 @@ termux_step_make() { cd "$GOPATH"/src/github.com/VirusTotal/vt-cli + termux_go_get -d -v go build \ -ldflags "-X github.com/VirusTotal/vt-cli/cmd.Version=$TERMUX_PKG_VERSION" \ -o "$TERMUX_PREFIX"/bin/vt-cli \ From 0fab4c6c949e76ce3415066fac4ae6c506cd7b9f Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 08:59:32 +0530 Subject: [PATCH 56/80] `wuzz`: Cache Golang dependencies --- packages/wuzz/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wuzz/build.sh b/packages/wuzz/build.sh index 71790ef1f..0c25dc6b4 100644 --- a/packages/wuzz/build.sh +++ b/packages/wuzz/build.sh @@ -14,6 +14,7 @@ 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 } From 76c5b974174e3f519a877b9d6147c4bc72f78c53 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 09:00:24 +0530 Subject: [PATCH 57/80] `ylutubedr`: Cache Golang dependencies --- packages/youtubedr/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/youtubedr/build.sh b/packages/youtubedr/build.sh index 03f4c704f..9d7ec14dd 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/" - go get -d -v + termux_go_get -d -v cd cmd/youtubedr go build . } From 9080bebe99e76cf6e3302bcedef2c58936739657 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 09:52:43 +0530 Subject: [PATCH 58/80] `gopass`: Do not cache Golang dependemcies --- packages/gopass/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gopass/build.sh b/packages/gopass/build.sh index 770f2540a..384875306 100644 --- a/packages/gopass/build.sh +++ b/packages/gopass/build.sh @@ -18,7 +18,7 @@ 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'" - termux_go_get -d -v + # TODO: Cache Go dependencies for on device builds install -Dm700 \ ./src/github.com/gopasspw/gopass/gopass \ "$TERMUX_PREFIX"/bin/gopass From 10282738d8a7da926d9baacd071cbc7d98134fd7 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 10:14:52 +0530 Subject: [PATCH 59/80] `ca-certificates`: Bump to 2021.07.05 --- packages/ca-certificates/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ca-certificates/build.sh b/packages/ca-certificates/build.sh index 5b8c26e93..f9c764d3e 100644 --- a/packages/ca-certificates/build.sh +++ b/packages/ca-certificates/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://curl.se/docs/caextract.html TERMUX_PKG_DESCRIPTION="Common CA certificates" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=20210525 +TERMUX_PKG_VERSION=20210705 TERMUX_PKG_SRCURL=https://curl.se/ca/cacert.pem # If the checksum has changed, it may be time to update the package version: -TERMUX_PKG_SHA256=3a32ad57e7f5556e36ede625b854057ac51f996d59e0952c207040077cbe48a9 +TERMUX_PKG_SHA256=a3b534269c6974631db35f952e8d7c7dbf3d81ab329a232df575c2661de1214a TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true From 198f9d4a4281a12ec81f0253849ab567154546f1 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 10:22:41 +0530 Subject: [PATCH 60/80] `helm`: Do not cache Golang dependemcies --- packages/helm/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helm/build.sh b/packages/helm/build.sh index b775e7ce8..7cd610334 100644 --- a/packages/helm/build.sh +++ b/packages/helm/build.sh @@ -12,7 +12,7 @@ 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" - termux_go_get -d -v + # TODO: Cache Golang dependencies make } From 05a39f4d5fa41329c518bc888bdc3c22e8fc6fdb Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 10:50:54 +0530 Subject: [PATCH 61/80] `hydroxide`: Do not cache Golang dependemcies --- packages/hydroxide/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hydroxide/build.sh b/packages/hydroxide/build.sh index 3c360e923..7369210de 100644 --- a/packages/hydroxide/build.sh +++ b/packages/hydroxide/build.sh @@ -12,7 +12,7 @@ termux_step_make() { export GOPATH=$TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_SRCDIR - termux_go_get + #TODO: Cache Golang dependencies go build ./cmd/hydroxide } From c5dad96e3f9028b354ee5f953e4ecf584c1f7cf8 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 11:40:44 +0530 Subject: [PATCH 62/80] `keybase`: Do not cache Golang dependemcies --- packages/keybase/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 5f7317be3..9c3e64a0b 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -17,7 +17,7 @@ termux_step_make_install() { ln -sf "$PWD" .gopath/src/github.com/keybase/client export GOPATH="$PWD/.gopath" - termux_go_get -d -v + # TODO: Cache Golang dependencies go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase go build -v -tags 'production' -o kbfsfusebin github.com/keybase/client/go/kbfs/kbfsfuse From 7d538646d1ddfeaa3d515f29912c71df3770c2e6 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 13:11:48 +0530 Subject: [PATCH 63/80] `keybase`: Bump to 5.7.1 --- packages/keybase/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 9c3e64a0b..4fa887d32 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://keybase.io TERMUX_PKG_DESCRIPTION="Key directory that maps social media identities to encryption keys" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=5.6.1 +TERMUX_PKG_VERSION=5.7.1 TERMUX_PKG_SRCURL=https://github.com/keybase/client/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=d54c2444e18b83e6c3f39c3d96ee87d1c178fd2812cda0718b70d10289b76685 +TERMUX_PKG_SHA256=9b51262582db59c0f9b3b63f488632f4cad2b769aded0aaaa8a4e5c85988e5bb TERMUX_PKG_REPLACES="kbfs" TERMUX_PKG_CONFLICTS="kbfs" From 33de19d982f5a47ecc43e584428d4fb1e1f90c6a Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 14:14:52 +0530 Subject: [PATCH 64/80] `go mod tidy` before keybase build --- packages/keybase/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 4fa887d32..7ca07dd98 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -16,7 +16,8 @@ termux_step_make_install() { mkdir -p .gopath/src/github.com/keybase ln -sf "$PWD" .gopath/src/github.com/keybase/client export GOPATH="$PWD/.gopath" - + + go mod tidy # TODO: Cache Golang dependencies go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase From eb88c48d392f37674ea18e2d0e88de6f2fe6d3c5 Mon Sep 17 00:00:00 2001 From: YAKSH BARIYA Date: Tue, 6 Jul 2021 15:09:47 +0530 Subject: [PATCH 65/80] `keybase`: Do not go mod tidy --- packages/keybase/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 7ca07dd98..7fdb1af93 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -17,7 +17,6 @@ termux_step_make_install() { ln -sf "$PWD" .gopath/src/github.com/keybase/client export GOPATH="$PWD/.gopath" - go mod tidy # TODO: Cache Golang dependencies go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase From fb45bb39aa3ea59ed62ac8078045177de67dbf98 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 15:50:21 +0530 Subject: [PATCH 66/80] Fix build errors for keybase --- packages/keybase/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 7ca07dd98..c4032066c 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -19,9 +19,9 @@ termux_step_make_install() { go mod tidy # TODO: Cache Golang dependencies - go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase - go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase - go build -v -tags 'production' -o kbfsfusebin github.com/keybase/client/go/kbfs/kbfsfuse + go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase/main.go + go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase/main.go + go build -v -tags 'production' -o kbfsfusebin github.com/keybase/client/go/kbfs/kbfsfuse/main.go cp keybase $TERMUX_PREFIX/bin/keybase cp git-remote-keybase $TERMUX_PREFIX/bin/git-remote-keybase From 4ef4eee4ea51824f61be0a749e5a1c0af2a0ef37 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Tue, 6 Jul 2021 17:02:07 +0530 Subject: [PATCH 67/80] Fix build errors for keybase --- packages/keybase/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 61662d488..01d26fcdb 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -7,6 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/keybase/client/archive/v${TERMUX_PKG_VERSIO TERMUX_PKG_SHA256=9b51262582db59c0f9b3b63f488632f4cad2b769aded0aaaa8a4e5c85988e5bb TERMUX_PKG_REPLACES="kbfs" TERMUX_PKG_CONFLICTS="kbfs" +TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { cd $TERMUX_PKG_SRCDIR @@ -18,9 +19,9 @@ termux_step_make_install() { export GOPATH="$PWD/.gopath" # TODO: Cache Golang dependencies - go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase/main.go - go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase/main.go - go build -v -tags 'production' -o kbfsfusebin github.com/keybase/client/go/kbfs/kbfsfuse/main.go + go build -v -tags 'production' -o keybase ./keybase/client/go/keybase/main.go + go build -v -tags 'production' -o git-remote-keybase ./keybase/client/go/kbfs/kbfsgit/git-remote-keybase/main.go + go build -v -tags 'production' -o kbfsfusebin ./keybase/client/go/kbfs/kbfsfuse/main.go cp keybase $TERMUX_PREFIX/bin/keybase cp git-remote-keybase $TERMUX_PREFIX/bin/git-remote-keybase From 03465edffa771b18feb7e712fe1f7ab104230c93 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 19:42:09 +0530 Subject: [PATCH 68/80] Indo all keybase changes --- packages/keybase/build.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 01d26fcdb..06ba5fc75 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -2,12 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://keybase.io TERMUX_PKG_DESCRIPTION="Key directory that maps social media identities to encryption keys" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=5.7.1 +TERMUX_PKG_VERSION=5.6.1 TERMUX_PKG_SRCURL=https://github.com/keybase/client/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=9b51262582db59c0f9b3b63f488632f4cad2b769aded0aaaa8a4e5c85988e5bb +TERMUX_PKG_SHA256=d54c2444e18b83e6c3f39c3d96ee87d1c178fd2812cda0718b70d10289b76685 TERMUX_PKG_REPLACES="kbfs" TERMUX_PKG_CONFLICTS="kbfs" -TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { cd $TERMUX_PKG_SRCDIR @@ -17,11 +16,10 @@ termux_step_make_install() { mkdir -p .gopath/src/github.com/keybase ln -sf "$PWD" .gopath/src/github.com/keybase/client export GOPATH="$PWD/.gopath" - - # TODO: Cache Golang dependencies - go build -v -tags 'production' -o keybase ./keybase/client/go/keybase/main.go - go build -v -tags 'production' -o git-remote-keybase ./keybase/client/go/kbfs/kbfsgit/git-remote-keybase/main.go - go build -v -tags 'production' -o kbfsfusebin ./keybase/client/go/kbfs/kbfsfuse/main.go + + go build -v -tags 'production' -o keybase github.com/keybase/client/go/keybase + go build -v -tags 'production' -o git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase + go build -v -tags 'production' -o kbfsfusebin github.com/keybase/client/go/kbfs/kbfsfuse cp keybase $TERMUX_PREFIX/bin/keybase cp git-remote-keybase $TERMUX_PREFIX/bin/git-remote-keybase From ea0c773a3e6ba4a49638c952b725d772b7f5945f Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 21:04:44 +0530 Subject: [PATCH 69/80] `virustotal-cli`: Do not cache Golang dependemcies --- packages/virustotal-cli/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virustotal-cli/build.sh b/packages/virustotal-cli/build.sh index a10c4b84d..544792c4b 100644 --- a/packages/virustotal-cli/build.sh +++ b/packages/virustotal-cli/build.sh @@ -17,7 +17,7 @@ termux_step_make() { cd "$GOPATH"/src/github.com/VirusTotal/vt-cli - termux_go_get -d -v + # TODO: Cache Golang dependencies go build \ -ldflags "-X github.com/VirusTotal/vt-cli/cmd.Version=$TERMUX_PKG_VERSION" \ -o "$TERMUX_PREFIX"/bin/vt-cli \ From 94f2d70d35c55062bf6c3aa34086424d2348ced7 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:09:51 +0530 Subject: [PATCH 70/80] `clash`: Cache Golang dependencies --- packages/clash/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/clash/build.sh b/packages/clash/build.sh index 88abf9493..9acd469d8 100644 --- a/packages/clash/build.sh +++ b/packages/clash/build.sh @@ -12,7 +12,8 @@ termux_step_make() { mkdir ./gopath export GOPATH="$PWD/gopath" - + + termux_go_get GOBUILD=CGO_ENABLED=0 \ go build \ -trimpath \ From 999f4365ba2e33b0f5035b493d397807ae427b3b Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:11:41 +0530 Subject: [PATCH 71/80] `go-findimagedupes`: Cache Golang dependencies --- packages/go-findimagedupes/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/go-findimagedupes/build.sh b/packages/go-findimagedupes/build.sh index 03bf6ca56..daaa06869 100644 --- a/packages/go-findimagedupes/build.sh +++ b/packages/go-findimagedupes/build.sh @@ -23,7 +23,8 @@ 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 . } From bbd83755c1061a350ac4796b7f56ff4dcefb5b19 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:12:11 +0530 Subject: [PATCH 72/80] `micro`: Cache Golang dependencies --- packages/micro/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/micro/build.sh b/packages/micro/build.sh index cb88e3f7a..a5a3a7516 100644 --- a/packages/micro/build.sh +++ b/packages/micro/build.sh @@ -21,6 +21,7 @@ termux_step_make_install() { cd $MICRO_SRC make build-quick + # TODO: Cache Golamg dependencies mv micro $TERMUX_PREFIX/bin/micro } From 7a756274d84ffa7bdf0f5064ea9904814e8d0d8f Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:12:29 +0530 Subject: [PATCH 73/80] `o-editor`: Cache Golang dependencies --- packages/o-editor/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o-editor/build.sh b/packages/o-editor/build.sh index 5d90b0786..0a4639c3a 100644 --- a/packages/o-editor/build.sh +++ b/packages/o-editor/build.sh @@ -16,6 +16,7 @@ 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 } From 7b012db72f09e9d05815fb7f7c9c12223ba11252 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:13:32 +0530 Subject: [PATCH 74/80] `obfs4proxy`: Cache Golang dependencies --- packages/obfs4proxy/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/obfs4proxy/build.sh b/packages/obfs4proxy/build.sh index a800c2358..9b07f38d4 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 - go get -d ./... + termux_go_get -d ./... go build . } From 9928c680374ceabda0937a1107e669fe154e9e92 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:13:49 +0530 Subject: [PATCH 75/80] `rclone`: Cache Golang dependencies --- packages/rclone/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh index 7e2f93b45..bdd7226a0 100644 --- a/packages/rclone/build.sh +++ b/packages/rclone/build.sh @@ -16,6 +16,7 @@ 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. From 511d71316d91c11d210f5c443d1cfabf4b5adf90 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:14:03 +0530 Subject: [PATCH 76/80] `rush: Cache Golang dependencies --- packages/rush/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rush/build.sh b/packages/rush/build.sh index 1c62e800d..c4b2de95c 100644 --- a/packages/rush/build.sh +++ b/packages/rush/build.sh @@ -17,8 +17,8 @@ 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 - go get -d -v + termux_go_get -d -v go install - install -Dm700 $TERMUX_PKG_BUILDDIR/bin/*/rush $TERMUX_PREFIX/bin/ + install -Dm700 $TERMUX_PKG_BUILDDIR/bin/rush $TERMUX_PREFIX/bin/ } From 56d07d393953a027007049a51c097f438b56a4a3 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:14:22 +0530 Subject: [PATCH 77/80] `shell2http: Cache Golang dependencies --- packages/shell2http/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shell2http/build.sh b/packages/shell2http/build.sh index ca5b3b878..e1a92a3e2 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 - go get -d -v + termux_go_get -d -v go build } From 0902b7e02a9e8cb925a497fa9bcb32c7cf7deceb Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Fri, 9 Jul 2021 22:15:12 +0530 Subject: [PATCH 78/80] Add todo comment for teleport-tsh --- packages/teleport-tsh/build.sh | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/teleport-tsh/build.sh b/packages/teleport-tsh/build.sh index 7f626c797..cd7018d40 100644 --- a/packages/teleport-tsh/build.sh +++ b/packages/teleport-tsh/build.sh @@ -2,21 +2,12 @@ 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=5.1.2 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SKIP_SRC_EXTRACT=true +TERMUX_PKG_VERSION=6.2.7 +TERMUX_PKG_SRCURL=https://github.com/gravitational/teleport/archive/refs/tags/v$TERMUX_PKG_VERSION.zip +TERMUX_PKG_SHA256=89ac7e5164f6e40c00b469065727d4c71d8c4c6180b60c43958b2154e18069d5 termux_step_make_install() { termux_setup_golang - export GOPATH=$TERMUX_PKG_BUILDDIR - export BUILDDIR=$TERMUX_PREFIX/bin - - mkdir -p $GOPATH/src/github.com/gravitational - cd $GOPATH/src/github.com/gravitational - git clone https://github.com/gravitational/teleport.git - cd teleport - - git checkout "v$TERMUX_PKG_VERSION" - - make $BUILDDIR/tsh + # TODO: Cache Golang dependency + make full } From ea194a05761874f41afab651e63b264030d41aae Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sat, 10 Jul 2021 08:19:38 +0530 Subject: [PATCH 79/80] Fix build errors for rush --- packages/rush/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rush/build.sh b/packages/rush/build.sh index c4b2de95c..f98a62233 100644 --- a/packages/rush/build.sh +++ b/packages/rush/build.sh @@ -20,5 +20,5 @@ termux_step_make_install() { termux_go_get -d -v go install - install -Dm700 $TERMUX_PKG_BUILDDIR/bin/rush $TERMUX_PREFIX/bin/ + install -Dm700 $TERMUX_PKG_BUILDDIR/bin/*/rush $TERMUX_PREFIX/bin/ } From 00885bee35a4a6bc51d04874fe49083fe546cc6e Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sat, 10 Jul 2021 11:36:14 +0530 Subject: [PATCH 80/80] Fix build errors for teleport-tsh --- packages/teleport-tsh/build.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/teleport-tsh/build.sh b/packages/teleport-tsh/build.sh index cd7018d40..de92b1b55 100644 --- a/packages/teleport-tsh/build.sh +++ b/packages/teleport-tsh/build.sh @@ -3,11 +3,19 @@ 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_SRCURL=https://github.com/gravitational/teleport/archive/refs/tags/v$TERMUX_PKG_VERSION.zip -TERMUX_PKG_SHA256=89ac7e5164f6e40c00b469065727d4c71d8c4c6180b60c43958b2154e18069d5 +TERMUX_PKG_SKIP_SRC_EXTRACT=true termux_step_make_install() { termux_setup_golang - # TODO: Cache Golang dependency - make full + export GOPATH=$TERMUX_PKG_BUILDDIR + export BUILDDIR=$TERMUX_PREFIX/bin + + mkdir -p $GOPATH/src/github.com/gravitational + cd $GOPATH/src/github.com/gravitational + git clone https://github.com/gravitational/teleport.git + cd teleport + + git checkout "v$TERMUX_PKG_VERSION" + termux_go_get + make $BUILDDIR/tsh }