Revert "Merge pull request #7104 from thunder-coding/cache-godeps"

This reverts commit f6892c38d8, reversing
changes made to 4d9075fea3.
This commit is contained in:
Leonid Pliushch 2021-07-10 17:00:18 +03:00
parent f6892c38d8
commit 4b8c077711
No known key found for this signature in database
GPG Key ID: 45F2964132545795
55 changed files with 63 additions and 111 deletions

View File

@ -10,5 +10,4 @@ TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() { termux_step_pre_configure() {
termux_setup_golang termux_setup_golang
termux_go_get
} }

View File

@ -5,11 +5,12 @@ TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.0.0-rc.3 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_SRCURL=https://github.com/FiloSottile/age/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e352d8b4e08e0b493adf7ab3ea15b349fe07ab833d20395012aa516ea0c36708 TERMUX_PKG_SHA256=e352d8b4e08e0b493adf7ab3ea15b349fe07ab833d20395012aa516ea0c36708
TERMUX_PKG_BUILD_IN_SRC="true"
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
termux_go_get export GOPATH=$TERMUX_PKG_BUILDDIR
cd $TERMUX_PKG_SRCDIR
go build ./cmd/age go build ./cmd/age
go build ./cmd/age-keygen go build ./cmd/age-keygen
} }

View File

@ -14,7 +14,6 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/getantibody/antibody ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/getantibody/antibody
cd "$GOPATH"/src/github.com/getantibody/antibody cd "$GOPATH"/src/github.com/getantibody/antibody
termux_go_get -d -v
go build go build
} }

View File

@ -17,7 +17,6 @@ termux_step_make() {
go mod init go mod init
go mod vendor go mod vendor
termux_go_get -d -v
make install VERSION=$TERMUX_PKG_VERSION make install VERSION=$TERMUX_PKG_VERSION
} }

View File

@ -16,7 +16,7 @@ termux_step_make() {
mkdir -p "$TERMUX_PREFIX"/share/doc/brook mkdir -p "$TERMUX_PREFIX"/share/doc/brook
cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/txthinking/brook cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/txthinking/brook
cd "$GOPATH"/src/github.com/txthinking/brook/cli/brook cd "$GOPATH"/src/github.com/txthinking/brook/cli/brook
termux_go_get -d -v go get -d -v
go build -o brook go build -o brook
} }

View File

@ -15,7 +15,6 @@ termux_step_make() {
cd $GOPATH/src/github.com/caddyserver/caddy/cmd/caddy cd $GOPATH/src/github.com/caddyserver/caddy/cmd/caddy
export GO111MODULE=on export GO111MODULE=on
termux_go_get -d -v
go build -v . go build -v .
} }

View File

@ -15,7 +15,7 @@ termux_step_make() {
cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi"
cd "${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 \ go build -tags noupgrade,noembeddocs \
-ldflags "-X github.com/twpayne/chezmoi/cmd.DocsDir=$TERMUX_PREFIX/share/doc/chezmoi -X main.version=${TERMUX_PKG_VERSION}" . -ldflags "-X github.com/twpayne/chezmoi/cmd.DocsDir=$TERMUX_PREFIX/share/doc/chezmoi -X main.version=${TERMUX_PKG_VERSION}" .
} }

View File

@ -12,8 +12,7 @@ termux_step_make() {
mkdir ./gopath mkdir ./gopath
export GOPATH="$PWD/gopath" export GOPATH="$PWD/gopath"
termux_go_get
GOBUILD=CGO_ENABLED=0 \ GOBUILD=CGO_ENABLED=0 \
go build \ go build \
-trimpath \ -trimpath \

View File

@ -11,7 +11,7 @@ termux_step_make() {
cd $TERMUX_PKG_SRCDIR cd $TERMUX_PKG_SRCDIR
termux_setup_golang termux_setup_golang
termux_go_get
go build -o croc -trimpath go build -o croc -trimpath
} }

View File

@ -16,7 +16,7 @@ termux_step_make() {
mkdir -p "$TERMUX_PREFIX"/share/doc/delve mkdir -p "$TERMUX_PREFIX"/share/doc/delve
cp -a "$TERMUX_PKG_SRCDIR" "$TERMUX_PKG_BUILDDIR"/src/github.com/go-delve/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/ cd "$TERMUX_PKG_BUILDDIR"/src/github.com/go-delve/delve/cmd/dlv/
termux_go_get -d -v go get -d -v
go build go build
} }

View File

@ -9,7 +9,6 @@ TERMUX_PKG_BUILD_IN_SRC=true
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
termux_go_get
make make
} }

View File

@ -15,7 +15,7 @@ termux_step_make() {
cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/muesli/duf" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/muesli/duf"
cd "${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 go build
} }

View File

@ -14,7 +14,6 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/elves/elvish ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/elves/elvish
cd "$GOPATH"/src/github.com/elves/elvish cd "$GOPATH"/src/github.com/elves/elvish
termux_go_get -d -v
go build go build
} }

View File

@ -11,7 +11,7 @@ TERMUX_PKG_BLACKLISTED_ARCHES="i686, arm"
termux_step_post_get_source() { termux_step_post_get_source() {
termux_setup_golang termux_setup_golang
export GOPATH=$TERMUX_PKG_SRCDIR/go export GOPATH=$TERMUX_PKG_SRCDIR/go
termux_go_get go get
chmod 777 $GOPATH -R chmod 777 $GOPATH -R
} }

View File

@ -28,7 +28,7 @@ termux_step_make() {
TERMUX_PKG_SRCDIR=$GOPATH/src/github.com/junegunn/fzf TERMUX_PKG_SRCDIR=$GOPATH/src/github.com/junegunn/fzf
cd $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 go build
} }

View File

@ -2,14 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://github.com/matsuyoshi30/germanium
TERMUX_PKG_DESCRIPTION="Generate image from source code" TERMUX_PKG_DESCRIPTION="Generate image from source code"
TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Raven Ravener <ravener.anime@gmail.com>" TERMUX_PKG_MAINTAINER="Raven Ravener <ravener.anime@gmail.com>"
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_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_PKG_BUILD_IN_SRC=true
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
termux_go_get
make build make build
} }

View File

@ -14,7 +14,6 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/ethereum/go-ethereum ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/ethereum/go-ethereum
cd "$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 for applet in geth abigen bootnode ethkey evm rlpdump puppeth; do
(cd ./cmd/"$applet" && go build -v) (cd ./cmd/"$applet" && go build -v)
done done

View File

@ -20,7 +20,7 @@ termux_step_make() {
mkdir -p "$TERMUX_PREFIX"/share/doc/gh mkdir -p "$TERMUX_PREFIX"/share/doc/gh
cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/cli/cli cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/cli/cli
cd "$GOPATH"/src/github.com/cli/cli/cmd/gh 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" go build -ldflags="-X github.com/cli/cli/internal/build.Version=$TERMUX_PKG_VERSION"
} }

View File

@ -15,7 +15,6 @@ termux_step_make() {
cd "$GOPATH"/github.com/git-lfs/git-lfs 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_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 go build git-lfs.go
} }

View File

@ -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.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.AppWorkPath=$TERMUX_PREFIX/var/lib/gitea"
LDFLAGS+=" -X code.gitea.io/gitea/modules/setting.CustomPath=$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 GITEA_VERSION=v"$TERMUX_PKG_VERSION" TAGS="bindata sqlite" make all
} }

View File

@ -16,7 +16,7 @@ termux_step_make() {
cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/charmbracelet/glow"
cd "${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 go build
} }

View File

@ -23,8 +23,7 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/gitlab.com/opennota/findimagedupes ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/gitlab.com/opennota/findimagedupes
cd "$GOPATH"/src/gitlab.com/opennota/findimagedupes cd "$GOPATH"/src/gitlab.com/opennota/findimagedupes
termux_go_get -d -v
go build . go build .
} }

View File

@ -15,7 +15,7 @@ termux_step_handle_hostbuild() {
export GOPATH=$TERMUX_PKG_HOSTBUILD_DIR export GOPATH=$TERMUX_PKG_HOSTBUILD_DIR
mkdir -p $TERMUX_PKG_HOSTBUILD_DIR mkdir -p $TERMUX_PKG_HOSTBUILD_DIR
cd $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() { 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.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.AppWorkPath=$TERMUX_PREFIX/var/lib/gogs"
LDFLAGS+=" -X gogs.io/gogs/internal/conf.CustomPath=$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 PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/bin GOGS_VERSION=v"$TERMUX_PKG_VERSION" TAGS="bindata sqlite" make all
} }

View File

@ -18,7 +18,6 @@ termux_step_make() {
rm -f ./src/github.com/gopasspw/gopass/gopass 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'" 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 \ install -Dm700 \
./src/github.com/gopasspw/gopass/gopass \ ./src/github.com/gopasspw/gopass/gopass \
"$TERMUX_PREFIX"/bin/gopass "$TERMUX_PREFIX"/bin/gopass

View File

@ -17,7 +17,6 @@ termux_step_make() {
cd "$GOPATH"/src/github.com/yudai/gotty cd "$GOPATH"/src/github.com/yudai/gotty
go mod init || go mod download go mod init || go mod download
#go mod tidy #go mod tidy
termux_go_get -d -v
go build go build
} }

View File

@ -12,7 +12,6 @@ termux_step_make() {
mkdir -p "${TERMUX_PKG_BUILDDIR}/src/github.com/helm" mkdir -p "${TERMUX_PKG_BUILDDIR}/src/github.com/helm"
cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm"
cd "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm" cd "${TERMUX_PKG_BUILDDIR}/src/github.com/helm/helm"
# TODO: Cache Golang dependencies
make make
} }

View File

@ -18,7 +18,6 @@ termux_step_host_build() {
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub"
cd "${GOPATH}/src/github.com/github/hub" cd "${GOPATH}/src/github.com/github/hub"
termux_go_get -d -v
make man-pages make man-pages
} }
@ -31,7 +30,6 @@ termux_step_make_install() {
mkdir -p "${GOPATH}/src/github.com/github" mkdir -p "${GOPATH}/src/github.com/github"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/github/hub"
cd "${GOPATH}/src/github.com/github/hub" cd "${GOPATH}/src/github.com/github/hub"
termux_go_get -d -v
make bin/hub "prefix=$TERMUX_PREFIX" make bin/hub "prefix=$TERMUX_PREFIX"
install -Dm700 ./bin/hub "$TERMUX_PREFIX"/bin/hub install -Dm700 ./bin/hub "$TERMUX_PREFIX"/bin/hub

View File

@ -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_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24 TERMUX_PKG_SHA256=9f1c983fe649f0d602481c848ebf863c9d3b3bc9c0e6a237c35e96e33a1b5d24
TERMUX_PKG_DEPENDS="libc++" TERMUX_PKG_DEPENDS="libc++"
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
export GOPATH=$TERMUX_PKG_SRCDIR/go export GOPATH=$TERMUX_PKG_BUILDDIR
termux_go_get
cd $TERMUX_PKG_SRCDIR
go build \ go build \
-o hugo \ -o "$TERMUX_PREFIX/bin/hugo" \
-tags "linux extended" \
main.go main.go
if ! $TERMUX_ON_DEVICE_BUILD; then # "linux" tag should not be necessary
chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg # try removing when golang version is upgraded
unset GOOS GOARCH CGO_LDFLAGS
unset CC CXX CFLAGS CXXFLAGS LDFLAGS # Building for host to generate manpages and completion.
go build \ chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg
-o hugo-host \ unset GOOS GOARCH CGO_LDFLAGS
main.go unset CC CXX CFLAGS CXXFLAGS LDFLAGS
fi 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() { 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} 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 --completionfile=$TERMUX_PREFIX/share/bash-completion/completions/hugo
$HUGO gen man \ $TERMUX_PKG_BUILDDIR/hugo gen man \
--dir=$TERMUX_PREFIX/share/man/man1/ --dir=$TERMUX_PREFIX/share/man/man1/
} }

View File

@ -12,7 +12,6 @@ termux_step_make() {
export GOPATH=$TERMUX_PKG_BUILDDIR export GOPATH=$TERMUX_PKG_BUILDDIR
cd $TERMUX_PKG_SRCDIR cd $TERMUX_PKG_SRCDIR
#TODO: Cache Golang dependencies
go build ./cmd/hydroxide go build ./cmd/hydroxide
} }

View File

@ -25,8 +25,7 @@ termux_step_make() {
mkdir -p "${GOPATH}/src/github.com/ipfs" mkdir -p "${GOPATH}/src/github.com/ipfs"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/ipfs/go-ipfs"
cd "${GOPATH}/src/github.com/ipfs/go-ipfs" cd "${GOPATH}/src/github.com/ipfs/go-ipfs"
termux_go_get -d -v
make build make build
# Fix folders without write permissions preventing which fails repeating builds: # Fix folders without write permissions preventing which fails repeating builds:

View File

@ -12,9 +12,9 @@ termux_step_make() {
export GOPATH=$TERMUX_PKG_BUILDDIR export GOPATH=$TERMUX_PKG_BUILDDIR
cd $TERMUX_PKG_SRCDIR cd $TERMUX_PKG_SRCDIR
termux_go_get
go build \ go build \
-o "$TERMUX_PREFIX/bin/jfrog" \ -o "$TERMUX_PREFIX/bin/jfrog" \
-tags "linux extended" \
main.go main.go
# "linux" tag should not be necessary # "linux" tag should not be necessary
# try removing when golang version is upgraded # try removing when golang version is upgraded
@ -25,6 +25,7 @@ termux_step_make() {
unset CC CXX CFLAGS CXXFLAGS LDFLAGS unset CC CXX CFLAGS CXXFLAGS LDFLAGS
go build \ go build \
-o "$TERMUX_PKG_BUILDDIR/jfrog" \ -o "$TERMUX_PKG_BUILDDIR/jfrog" \
-tags "linux extended" \
main.go main.go
# "linux" tag should not be necessary # "linux" tag should not be necessary
# try removing when golang version is upgraded # try removing when golang version is upgraded

View File

@ -13,7 +13,7 @@ termux_step_make() {
cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/derailed/k9s" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/derailed/k9s"
cd "${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 go build
} }

View File

@ -34,7 +34,6 @@ termux_step_make() {
#rm -rf "$TERMUX_PKG_SRCDIR"/_output #rm -rf "$TERMUX_PKG_SRCDIR"/_output
cd "$TERMUX_PKG_SRCDIR"/cmd/kubectl cd "$TERMUX_PKG_SRCDIR"/cmd/kubectl
termux_go_get -d -v
go build . go build .
} }

View File

@ -16,7 +16,7 @@ termux_step_make() {
cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/jesseduffield/lazygit" cp -a "${TERMUX_PKG_SRCDIR}" "${TERMUX_PKG_BUILDDIR}/src/github.com/jesseduffield/lazygit"
cd "${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 go build
} }

View File

@ -13,7 +13,6 @@ termux_step_make() {
mkdir -p "$GOPATH/src/github.com/gokcehan" mkdir -p "$GOPATH/src/github.com/gokcehan"
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH/src/github.com/gokcehan/lf" ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH/src/github.com/gokcehan/lf"
cd "$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 go build -ldflags="-X main.gVersion=r$TERMUX_PKG_VERSION" -trimpath
} }

View File

@ -21,7 +21,6 @@ termux_step_make_install() {
cd $MICRO_SRC cd $MICRO_SRC
make build-quick make build-quick
# TODO: Cache Golamg dependencies
mv micro $TERMUX_PREFIX/bin/micro mv micro $TERMUX_PREFIX/bin/micro
} }

View File

@ -16,7 +16,6 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/xyproto/o ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/xyproto/o
cd "$GOPATH"/src/github.com/xyproto/o cd "$GOPATH"/src/github.com/xyproto/o
termux_go_get -d -v
go build go build
} }

View File

@ -15,7 +15,7 @@ TERMUX_PKG_DEPENDS="tor"
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
cd "$TERMUX_PKG_SRCDIR"/obfs4proxy cd "$TERMUX_PKG_SRCDIR"/obfs4proxy
termux_go_get -d ./... go get -d ./...
go build . go build .
} }

View File

@ -6,16 +6,12 @@ TERMUX_PKG_SRCURL=https://github.com/ProtonMail/proton-bridge.git
TERMUX_PKG_GIT_BRANCH=br-$TERMUX_PKG_VERSION TERMUX_PKG_GIT_BRANCH=br-$TERMUX_PKG_VERSION
TERMUX_PKG_MAINTAINER="Radomír Polách <rp@t4d.cz>" TERMUX_PKG_MAINTAINER="Radomír Polách <rp@t4d.cz>"
TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686" 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_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 install -Dm700 proton-bridge "$TERMUX_PREFIX"/bin/proton-bridge
} }

View File

@ -18,7 +18,7 @@ termux_step_make() {
cd "${GOPATH}/src/github.com/ericchiang/pup" cd "${GOPATH}/src/github.com/ericchiang/pup"
export GO111MODULE=off export GO111MODULE=off
termux_go_get -d -v go get -d -v
go build go build
} }

View File

@ -16,7 +16,6 @@ termux_step_make_install() {
ln -sf "$PWD" .gopath/src/github.com/rclone/rclone ln -sf "$PWD" .gopath/src/github.com/rclone/rclone
export GOPATH="$PWD/.gopath" 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 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. # XXX: Fix read-only files which prevents removal of src dir.

View File

@ -25,7 +25,6 @@ termux_step_make() {
rm -f ./restic rm -f ./restic
) )
termux_go_get -d -v
go build -ldflags "-X 'main.version=${TERMUX_PKG_VERSION}'" ./cmd/... go build -ldflags "-X 'main.version=${TERMUX_PKG_VERSION}'" ./cmd/...
} }

View File

@ -17,7 +17,7 @@ termux_step_make_install() {
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/shenwei356/rush" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/shenwei356/rush"
cd "${GOPATH}/src/github.com/shenwei356/rush" cd "${GOPATH}/src/github.com/shenwei356/rush"
go mod init rush go mod init rush
termux_go_get -d -v go get -d -v
go install go install
install -Dm700 $TERMUX_PKG_BUILDDIR/bin/*/rush $TERMUX_PREFIX/bin/ install -Dm700 $TERMUX_PKG_BUILDDIR/bin/*/rush $TERMUX_PREFIX/bin/

View File

@ -17,7 +17,7 @@ termux_step_make() {
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/msoap/shell2http"
cd "${GOPATH}/src/github.com/msoap/shell2http" cd "${GOPATH}/src/github.com/msoap/shell2http"
go mod init go mod init
termux_go_get -d -v go get -d -v
go build go build
} }

View File

@ -16,7 +16,7 @@ termux_step_make() {
mkdir -p "$TERMUX_PREFIX"/share/doc/shiori mkdir -p "$TERMUX_PREFIX"/share/doc/shiori
cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/go-shiori/shiori cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/go-shiori/shiori
cd "$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 go build
} }

View File

@ -5,11 +5,12 @@ TERMUX_PKG_MAINTAINER="Yaksh Bariya <yakshbari4@gmail.com>"
TERMUX_PKG_VERSION=0.4.1 TERMUX_PKG_VERSION=0.4.1
TERMUX_PKG_SRCURL=https://github.com/maaslalani/slides/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SRCURL=https://github.com/maaslalani/slides/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=f1c3494ec8d52ebb0351f1722d60ad4f4dd56b1f649130adfe59db8c9ffaeae2 TERMUX_PKG_SHA256=f1c3494ec8d52ebb0351f1722d60ad4f4dd56b1f649130adfe59db8c9ffaeae2
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_make() { termux_step_make() {
termux_setup_golang termux_setup_golang
termux_go_get
export GOPATH=$TERMUX_PKG_BUILDDIR
cd "$TERMUX_PKG_SRCDIR"
make build make build
} }

View File

@ -13,7 +13,7 @@ termux_step_make_install() {
mkdir -p "${GOPATH}/src/go.mozilla.org" mkdir -p "${GOPATH}/src/go.mozilla.org"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/go.mozilla.org/sops" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/go.mozilla.org/sops"
cd "${GOPATH}/src/go.mozilla.org/sops" || return 9 cd "${GOPATH}/src/go.mozilla.org/sops" || return 9
termux_go_get -d -v go get -d -v
make install make install
install -Dm700 "${GOPATH}/bin/"*/sops "${TERMUX_PREFIX}/bin/sops" install -Dm700 "${GOPATH}/bin/"*/sops "${TERMUX_PREFIX}/bin/sops"

View File

@ -27,8 +27,7 @@ termux_step_make(){
export GO_ARCH=$GOARCH export GO_ARCH=$GOARCH
export _CC=$CC export _CC=$CC
unset GOOS GOARCH CC unset GOOS GOARCH CC
termux_go_get -d -v
# Now file structure is same as go get etc. # Now file structure is same as go get etc.
go build build.go go build build.go
export CC=$_CC export CC=$_CC

View File

@ -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_DESCRIPTION="Secure Access for Developers that doesn't get in the way"
TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux" 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_PKG_SKIP_SRC_EXTRACT=true
termux_step_make_install() { termux_step_make_install() {
@ -16,6 +17,6 @@ termux_step_make_install() {
cd teleport cd teleport
git checkout "v$TERMUX_PKG_VERSION" git checkout "v$TERMUX_PKG_VERSION"
termux_go_get
make $BUILDDIR/tsh make $BUILDDIR/tsh
} }

View File

@ -15,7 +15,7 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tmedwards/tweego ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tmedwards/tweego
cd "$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 go build
} }

View File

@ -15,7 +15,6 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tsenart/vegeta ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/tsenart/vegeta
cd "$GOPATH"/src/github.com/tsenart/vegeta cd "$GOPATH"/src/github.com/tsenart/vegeta
termux_go_get -d -v
go build go build
} }

View File

@ -17,7 +17,6 @@ termux_step_make() {
cd "$GOPATH"/src/github.com/VirusTotal/vt-cli cd "$GOPATH"/src/github.com/VirusTotal/vt-cli
# TODO: Cache Golang dependencies
go build \ go build \
-ldflags "-X github.com/VirusTotal/vt-cli/cmd.Version=$TERMUX_PKG_VERSION" \ -ldflags "-X github.com/VirusTotal/vt-cli/cmd.Version=$TERMUX_PKG_VERSION" \
-o "$TERMUX_PREFIX"/bin/vt-cli \ -o "$TERMUX_PREFIX"/bin/vt-cli \

View File

@ -14,7 +14,6 @@ termux_step_make() {
ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/asciimoo/wuzz ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/asciimoo/wuzz
cd "$GOPATH"/src/github.com/asciimoo/wuzz cd "$GOPATH"/src/github.com/asciimoo/wuzz
termux_go_get -d -v
go build go build
} }

View File

@ -14,7 +14,7 @@ termux_step_make() {
mkdir -p "${GOPATH}/src/github.com/kkdai/" mkdir -p "${GOPATH}/src/github.com/kkdai/"
cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube" cp -a "${TERMUX_PKG_SRCDIR}" "${GOPATH}/src/github.com/kkdai/youtube"
cd "${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 cd cmd/youtubedr
go build . go build .
} }

View File

@ -40,22 +40,3 @@ termux_setup_golang() {
export GOROOT="$TERMUX_PREFIX/lib/go" export GOROOT="$TERMUX_PREFIX/lib/go"
fi 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
}