1 |
commit: b67f3c23744d8b66f299b3202e3fb68f7df78740 |
2 |
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 14 21:08:28 2021 +0000 |
4 |
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 14 22:04:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67f3c23 |
7 |
|
8 |
app-admin/ryzen_monitor: 1.0.4-r1: fix issues around Makefile. |
9 |
|
10 |
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> |
11 |
|
12 |
.../ryzen_monitor/files/CFLAGS_override_fix.patch | 13 ----------- |
13 |
app-admin/ryzen_monitor/files/fix-Makefile.patch | 26 ++++++++++++++++++++++ |
14 |
...-1.0.4.ebuild => ryzen_monitor-1.0.4-r1.ebuild} | 2 +- |
15 |
3 files changed, 27 insertions(+), 14 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch b/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch |
18 |
deleted file mode 100644 |
19 |
index efe7fc5e45f..00000000000 |
20 |
--- a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch |
21 |
+++ /dev/null |
22 |
@@ -1,13 +0,0 @@ |
23 |
-diff --git a/src/Makefile b/src/Makefile |
24 |
-index 5142282..4c0dbb8 100644 |
25 |
---- a/src/Makefile |
26 |
-+++ b/src/Makefile |
27 |
-@@ -3,7 +3,7 @@ STRIP = strip |
28 |
- |
29 |
- CFLAGS = -O3 -mtune=native -march=native |
30 |
--CFLAGS += -Ilib |
31 |
-+override CFLAGS += -Ilib |
32 |
- LDFLAGS = -lm |
33 |
- |
34 |
- SFLAGS = --strip-all |
35 |
- |
36 |
|
37 |
diff --git a/app-admin/ryzen_monitor/files/fix-Makefile.patch b/app-admin/ryzen_monitor/files/fix-Makefile.patch |
38 |
new file mode 100644 |
39 |
index 00000000000..8488b285f36 |
40 |
--- /dev/null |
41 |
+++ b/app-admin/ryzen_monitor/files/fix-Makefile.patch |
42 |
@@ -0,0 +1,26 @@ |
43 |
+diff --git a/src/Makefile b/src/Makefile |
44 |
+index 5142282..8c8f3a0 100644 |
45 |
+--- a/src/Makefile |
46 |
++++ b/src/Makefile |
47 |
+@@ -1,11 +1,8 @@ |
48 |
+ CC = gcc |
49 |
+-STRIP = strip |
50 |
+ |
51 |
+ CFLAGS = -O3 -mtune=native -march=native |
52 |
+-CFLAGS += -Ilib |
53 |
+-LDFLAGS = -lm |
54 |
+- |
55 |
+-SFLAGS = --strip-all |
56 |
++override CFLAGS += -Ilib |
57 |
++override LDFLAGS += -lm |
58 |
+ |
59 |
+ OUT = ryzen_monitor |
60 |
+ |
61 |
+@@ -20,7 +17,6 @@ all: $(OUT) |
62 |
+ |
63 |
+ $(OUT): $(OBJ) |
64 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUT) $(OBJ) |
65 |
+- $(STRIP) $(SFLAGS) $(OUT) |
66 |
+ |
67 |
+ clean: |
68 |
+ rm -rf *.o lib/*.o |
69 |
|
70 |
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild |
71 |
similarity index 93% |
72 |
rename from app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild |
73 |
rename to app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild |
74 |
index 9ac20aa4527..f7b5d30fab9 100644 |
75 |
--- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild |
76 |
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild |
77 |
@@ -19,7 +19,7 @@ DEPEND="" |
78 |
RDEPEND="app-admin/ryzen_smu" |
79 |
|
80 |
PATCHES=( |
81 |
- "${FILESDIR}"/CFLAGS_override_fix.patch |
82 |
+ "${FILESDIR}"/fix-Makefile.patch |
83 |
) |
84 |
|
85 |
src_compile() { |