X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/ef04d40465ae7e2bbd2f855fc5e4bffb517d8f98..544181cd4fe22c3696af5d5d7d97a920dbc279c6:/packages/fzf/build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index b298ab94..d2f9e4fc 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -1,19 +1,36 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.16.2
+TERMUX_PKG_VERSION=0.16.6
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=6d63f82c5fc6c3b658d224e8ebac6afcd237ca30de709f4fc72692fa0b0524b1
+TERMUX_PKG_SHA256=6be4f32decc2e50b24a4b120a1e2217b437a2eaa77063435b0eb3268fc3f6573
 TERMUX_PKG_FOLDERNAME=fzf-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_DEPENDS="bash"
+# 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 () {
 	termux_setup_golang
 	export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
 	export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
 
+	# 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
-	make android-build
+	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