commit: 866d6a411c7dcf7891a11de2649b9c0751aa4bc8 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Feb 2 13:18:42 2021 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Feb 2 13:23:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866d6a41
x11-misc/i3blocks-contrib: respect CFLAGS Closes: https://bugs.gentoo.org/768318 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> .../files/i3blocks-contrib-respect-CFLAGS.patch | 22 ++++++++++++++++++++++ .../i3blocks-contrib-1.4.0_p20201127.ebuild | 2 ++ 2 files changed, 24 insertions(+) diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch new file mode 100644 index 00000000000..15d36b130db --- /dev/null +++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch @@ -0,0 +1,22 @@ +diff -ur a/bandwidth2/Makefile b/bandwidth2/Makefile +--- a/bandwidth2/Makefile 2021-02-02 07:03:47.002894030 -0600 ++++ b/bandwidth2/Makefile 2021-02-02 07:05:21.556854777 -0600 +@@ -1,6 +1,6 @@ + P=bandwidth2 + OBJECTS= +-CFLAGS=-g -Wall -Werror -O2 -std=c11 ++CFLAGS ?= -g -Wall -Werror -O2 -std=c11 + LDLIBS= + + $(P): $(OBJECTS) +diff -ur a/cpu_usage2/Makefile b/cpu_usage2/Makefile +--- a/cpu_usage2/Makefile 2021-02-02 07:03:47.004894029 -0600 ++++ b/cpu_usage2/Makefile 2021-02-02 07:05:51.138842328 -0600 +@@ -1,6 +1,6 @@ + P=cpu_usage2 + OBJECTS= +-CFLAGS=-g -Wall -Werror -O2 -std=gnu11 ++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11 + LDLIBS= + + $(P): $(OBJECTS) diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild index 01e8a293c8a..701962eefc8 100644 --- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild +++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild @@ -19,6 +19,8 @@ RDEPEND="!<x11-misc/i3blocks-1.5 >=x11-misc/i3blocks-1.5" BDEPEND="" +PATCHES=( "${FILESDIR}"/${PN}-respect-CFLAGS.patch ) + src_prepare() { sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile default
