1 |
commit: 866d6a411c7dcf7891a11de2649b9c0751aa4bc8 |
2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 2 13:18:42 2021 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 2 13:23:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866d6a41 |
7 |
|
8 |
x11-misc/i3blocks-contrib: respect CFLAGS |
9 |
|
10 |
Closes: https://bugs.gentoo.org/768318 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
13 |
|
14 |
.../files/i3blocks-contrib-respect-CFLAGS.patch | 22 ++++++++++++++++++++++ |
15 |
.../i3blocks-contrib-1.4.0_p20201127.ebuild | 2 ++ |
16 |
2 files changed, 24 insertions(+) |
17 |
|
18 |
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..15d36b130db |
21 |
--- /dev/null |
22 |
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch |
23 |
@@ -0,0 +1,22 @@ |
24 |
+diff -ur a/bandwidth2/Makefile b/bandwidth2/Makefile |
25 |
+--- a/bandwidth2/Makefile 2021-02-02 07:03:47.002894030 -0600 |
26 |
++++ b/bandwidth2/Makefile 2021-02-02 07:05:21.556854777 -0600 |
27 |
+@@ -1,6 +1,6 @@ |
28 |
+ P=bandwidth2 |
29 |
+ OBJECTS= |
30 |
+-CFLAGS=-g -Wall -Werror -O2 -std=c11 |
31 |
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11 |
32 |
+ LDLIBS= |
33 |
+ |
34 |
+ $(P): $(OBJECTS) |
35 |
+diff -ur a/cpu_usage2/Makefile b/cpu_usage2/Makefile |
36 |
+--- a/cpu_usage2/Makefile 2021-02-02 07:03:47.004894029 -0600 |
37 |
++++ b/cpu_usage2/Makefile 2021-02-02 07:05:51.138842328 -0600 |
38 |
+@@ -1,6 +1,6 @@ |
39 |
+ P=cpu_usage2 |
40 |
+ OBJECTS= |
41 |
+-CFLAGS=-g -Wall -Werror -O2 -std=gnu11 |
42 |
++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11 |
43 |
+ LDLIBS= |
44 |
+ |
45 |
+ $(P): $(OBJECTS) |
46 |
|
47 |
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 |
48 |
index 01e8a293c8a..701962eefc8 100644 |
49 |
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild |
50 |
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild |
51 |
@@ -19,6 +19,8 @@ RDEPEND="!<x11-misc/i3blocks-1.5 |
52 |
>=x11-misc/i3blocks-1.5" |
53 |
BDEPEND="" |
54 |
|
55 |
+PATCHES=( "${FILESDIR}"/${PN}-respect-CFLAGS.patch ) |
56 |
+ |
57 |
src_prepare() { |
58 |
sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile |
59 |
default |