X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/08f81b7cc715eb50ba282fa18c3a27298db7c878..d8608b14ec6c97f0228a63bea6b4044821f4ee61:/packages/fzf/build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index b58931eb..9a00bf6f 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -1,33 +1,36 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.15.5
+TERMUX_PKG_VERSION=0.16.7
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
+TERMUX_PKG_SHA256=9676664e02393d19dd0f0a1ae4cf5d20e3fffcba666a0cffc40ff6c590c67760
+TERMUX_PKG_FOLDERNAME=fzf-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_DEPENDS="bash, ncurses"
+# Depend on findutils as fzf uses the -fstype option, which busybox
+# find does not support, when invoking find:
+TERMUX_PKG_DEPENDS="bash, findutils"
 
 termux_step_make_install () {
-	export GOPATH=$TERMUX_PKG_TMPDIR
-	cd $GOPATH
-	mkdir -p src/github.com/junegunn/fzf
-	cp -Rf $TERMUX_PKG_SRCDIR/* src/github.com/junegunn/fzf
-
 	termux_setup_golang
-	export CGO_CFLAGS="-I$TERMUX_PREFIX/include -L$TERMUX_PREFIX/lib"
+	export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
 	export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
 
-	mkdir -p $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/{go-runewidth,go-shellwords}
-	for file in runewidth.go runewidth_posix.go; do
-		curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-runewidth/$file \
-		        https://raw.githubusercontent.com/junegunn/go-runewidth/master/$file
-	done
-	for file in shellwords.go util_posix.go; do
-		curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-shellwords/$file \
-		        https://raw.githubusercontent.com/junegunn/go-shellwords/master/$file
-	done
-
-	cd $GOPATH/src/github.com/junegunn/fzf/src/fzf
-	CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $TERMUX_PREFIX/bin/fzf
+	# See the fzf Makefile:
+	local _BINARY="fzf/fzf-${GOOS}_"
+	if [ $TERMUX_ARCH = "arm" ]; then
+		_BINARY+="arm7"
+	elif [ $TERMUX_ARCH = "i686" ]; then
+		_BINARY+="386"
+	elif [ $TERMUX_ARCH = "x86_64" ]; then
+		_BINARY+="amd64"
+	elif [ $TERMUX_ARCH = "aarch64" ]; then
+		_BINARY+="arm8"
+	else
+		termux_error_exit "Unsupported arch: $TERMUX_ARCH"
+	fi
+
+	cd $TERMUX_PKG_SRCDIR/src
+	LDFLAGS="-pie" make $_BINARY
+	cp $_BINARY $TERMUX_PREFIX/bin/fzf
 
 	# Install fzf-tmux, a bash script for launching fzf in a tmux pane:
 	cp $TERMUX_PKG_SRCDIR/bin/fzf-tmux $TERMUX_PREFIX/bin