From c25c48e6b76d5fd04c0ed8fcf99a6e6a033dfbd3 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 10 Jul 2017 10:09:47 +0200 Subject: [PATCH] fzf: Update from 0.16.7 to 0.16.8 --- packages/fzf/Makefile.patch | 12 ++++++++++++ packages/fzf/build.sh | 11 +++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 packages/fzf/Makefile.patch diff --git a/packages/fzf/Makefile.patch b/packages/fzf/Makefile.patch new file mode 100644 index 000000000..864d110a5 --- /dev/null +++ b/packages/fzf/Makefile.patch @@ -0,0 +1,12 @@ +diff -u -r ../fzf-0.16.8/Makefile ./Makefile +--- ../fzf-0.16.8/Makefile 2017-06-05 16:21:50.000000000 +0200 ++++ ./Makefile 2017-07-10 10:00:29.145783026 +0200 +@@ -99,7 +99,7 @@ + ln -sf $(ROOT_DIR)/vendor $(VENDOR_LINK) + + vendor: $(GLIDE_YAML) +- go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@ ++ GOOS= GOARCH= CGO_ENABLED= go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install && touch $@ + + test: $(SOURCES) vendor + SHELL=/bin/sh GOOS= go test -v -tags "$(TAGS)" \ diff --git a/packages/fzf/build.sh b/packages/fzf/build.sh index 9a00bf6fd..7ceefa46d 100644 --- a/packages/fzf/build.sh +++ b/packages/fzf/build.sh @@ -1,21 +1,25 @@ TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder" -TERMUX_PKG_VERSION=0.16.7 +TERMUX_PKG_VERSION=0.16.8 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=9676664e02393d19dd0f0a1ae4cf5d20e3fffcba666a0cffc40ff6c590c67760 +TERMUX_PKG_SHA256=daef99f67cff3dad261dbcf2aef995bb78b360bcc7098d7230cb11674e1ee1d4 TERMUX_PKG_FOLDERNAME=fzf-$TERMUX_PKG_VERSION TERMUX_PKG_BUILD_IN_SRC="yes" # 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" # See the fzf Makefile: - local _BINARY="fzf/fzf-${GOOS}_" + local _BINARY="target/fzf-${GOOS}_" if [ $TERMUX_ARCH = "arm" ]; then _BINARY+="arm7" elif [ $TERMUX_ARCH = "i686" ]; then @@ -28,7 +32,6 @@ termux_step_make_install () { termux_error_exit "Unsupported arch: $TERMUX_ARCH" fi - cd $TERMUX_PKG_SRCDIR/src LDFLAGS="-pie" make $_BINARY cp $_BINARY $TERMUX_PREFIX/bin/fzf