colordiff: Update from 1.0.16 to 1.0.18

[termux-packages] / packages / fzf / build.sh

diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh
index 3783ec2..9a00bf6 100644 (file)
--- 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.3
+TERMUX_PKG_VERSION=0.16.7
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=352c812cb40787c061912c6597a22e1d7edcbb1870a97be9884bcbf3fe6630ab
+TERMUX_PKG_SHA256=9676664e02393d19dd0f0a1ae4cf5d20e3fffcba666a0cffc40ff6c590c67760
 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