From 0c378a92d08608d3e63bf205eafc9de54e01de04 Mon Sep 17 00:00:00 2001 From: Wynn Wolf Arbor Date: Sun, 26 Apr 2020 14:48:09 +0200 Subject: app-shells/fzf: Bump to 0.21.1-r1 Upstream has fixed their Makefile in [1], so we can pull that patch in temporarily and switch over to using make instead of a custom call to go build. This commit also cleans up the ebuild a bit. [1] https://github.com/junegunn/fzf/commit/08c2bcb952a0abbead263dcb002 Package-Manager: Portage-2.3.89, Repoman-2.3.20 --- .../files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch (limited to 'app-shells/fzf/files') diff --git a/app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch b/app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch new file mode 100644 index 0000000..290b856 --- /dev/null +++ b/app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch @@ -0,0 +1,28 @@ +From 08c2bcb952a0abbead263dcb0026eab58e736e1d Mon Sep 17 00:00:00 2001 +From: Raffaele <1770381+rafspiny@users.noreply.github.com> +Date: Tue, 21 Apr 2020 03:07:39 +0200 +Subject: [PATCH] Quote LDFLAGS (#1995) + +Make sure that `extldflags` is quoted so that LDFLAGS containing spaces won't break the build command. + +Close #1994 +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 037b19b..60283d0 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ ROOT_DIR := $(shell dirname $(MAKEFILE)) + SOURCES := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE) + + REVISION := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES)) +-BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)" ++BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)" + + BINARY32 := fzf-$(GOOS)_386 + BINARY64 := fzf-$(GOOS)_amd64 +-- +2.26.2 + -- cgit v1.2.3-2-gb3c3