commit: 09a124492c3bef396d42acfa1d51a7b0cf996de3 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sat Apr 25 02:15:33 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sat Apr 25 02:21:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a12449
app-shells/fzy: revbump, respect LDFLAGS Closes: https://bugs.gentoo.org/719072 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> app-shells/fzy/files/1.0-cflags.patch | 34 ++++++++++++++++++++++ app-shells/fzy/files/fzy-0.9-cflags.patch | 11 ------- .../fzy/{fzy-1.0.ebuild => fzy-1.0-r1.ebuild} | 4 +-- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/app-shells/fzy/files/1.0-cflags.patch b/app-shells/fzy/files/1.0-cflags.patch new file mode 100644 index 00000000000..4805b4814a4 --- /dev/null +++ b/app-shells/fzy/files/1.0-cflags.patch @@ -0,0 +1,34 @@ +From 89b4a0437dce6f99de80482d484b3e0346067889 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakov...@gentoo.org> +Date: Fri, 24 Apr 2020 19:12:16 -0700 +Subject: [PATCH] cflags + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 2d23118..713daad 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION=1.0 + + CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE +-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps ++CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps + PREFIX?=/usr/local + MANDIR?=$(PREFIX)/share/man + BINDIR?=$(PREFIX)/bin +@@ -29,7 +29,7 @@ check: test/fzytest + $(DEBUGGER) ./test/fzytest + + fzy: $(OBJECTS) +- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS) ++ $(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) + + %.o: %.c config.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< +-- +2.26.2 + diff --git a/app-shells/fzy/files/fzy-0.9-cflags.patch b/app-shells/fzy/files/fzy-0.9-cflags.patch deleted file mode 100644 index 328abc9c6fe..00000000000 --- a/app-shells/fzy/files/fzy-0.9-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fzy-0.9/Makefile -+++ fzy-0.9/Makefile -@@ -1,7 +1,7 @@ - VERSION=0.9 - - CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE --CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps -+CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps - PREFIX?=/usr/local - MANDIR?=$(PREFIX)/share/man - BINDIR?=$(PREFIX)/bin diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0-r1.ebuild similarity index 92% rename from app-shells/fzy/fzy-1.0.ebuild rename to app-shells/fzy/fzy-1.0-r1.ebuild index 38f54c0bf9d..660ca21138e 100644 --- a/app-shells/fzy/fzy-1.0.ebuild +++ b/app-shells/fzy/fzy-1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/fzy-0.9-cflags.patch ) +PATCHES=( "${FILESDIR}"/1.0-cflags.patch ) src_prepare() { default
