X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/b388a2695860469cc4e7014adc816cb794853b92..9e425e970b54f1bf8dda2f8c35038743113a94c4:/packages/fzf/build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index bad64ed8..e1c08c2f 100644
--- a/packages/fzf/build.sh
+++ b/packages/fzf/build.sh
@@ -1,19 +1,39 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.16.4
+TERMUX_PKG_VERSION=0.16.11
+TERMUX_PKG_SHA256=e3067d4ad58d7be51eba9a35c06518cd7145c0cc297882796c7e40285f268a99
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=294034747b0739d716d88670e830a97080fb73b8d6172b2ae695074316903e8a
 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() {
+	:
+}
 
 termux_step_make_install () {
 	termux_setup_golang
 	export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
 	export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
 
-	cd $TERMUX_PKG_SRCDIR/src
-	make android-build
+	# See the fzf Makefile:
+	local _BINARY="target/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
+
+	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