[gentoo-commits] repo/gentoo:master commit in: app-admin/ryzen_monitor/files/, app-admin/ryzen_monitor/

[gentoo-commits] repo/gentoo:master commit in: app-admin/ryzen_monitor/files/, app-admin/ryzen_monitor/

[Piotr Karbowski]

commit:     b67f3c23744d8b66f299b3202e3fb68f7df78740
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 21:08:28 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 22:04:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67f3c23

app-admin/ryzen_monitor: 1.0.4-r1: fix issues around Makefile.

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 .../ryzen_monitor/files/CFLAGS_override_fix.patch  | 13 -----------
 app-admin/ryzen_monitor/files/fix-Makefile.patch   | 26 ++++++++++++++++++++++
 ...-1.0.4.ebuild => ryzen_monitor-1.0.4-r1.ebuild} |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch b/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch
deleted file mode 100644
index efe7fc5e45f..00000000000
--- a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 5142282..4c0dbb8 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,7 +3,7 @@ STRIP = strip
- 
- CFLAGS = -O3 -mtune=native -march=native
--CFLAGS += -Ilib
-+override CFLAGS += -Ilib
- LDFLAGS = -lm
- 
- SFLAGS = --strip-all
- 

diff --git a/app-admin/ryzen_monitor/files/fix-Makefile.patch b/app-admin/ryzen_monitor/files/fix-Makefile.patch
new file mode 100644
index 00000000000..8488b285f36
--- /dev/null
+++ b/app-admin/ryzen_monitor/files/fix-Makefile.patch
@@ -0,0 +1,26 @@
+diff --git a/src/Makefile b/src/Makefile
+index 5142282..8c8f3a0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,11 +1,8 @@
+ CC = gcc
+-STRIP = strip
+ 
+ CFLAGS = -O3 -mtune=native -march=native
+-CFLAGS += -Ilib
+-LDFLAGS = -lm
+-
+-SFLAGS = --strip-all
++override CFLAGS += -Ilib
++override LDFLAGS += -lm
+ 
+ OUT = ryzen_monitor
+ 
+@@ -20,7 +17,6 @@ all: $(OUT)
+ 
+ $(OUT): $(OBJ)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OUT) $(OBJ)
+-	$(STRIP) $(SFLAGS) $(OUT)
+ 
+ clean:
+ 	rm -rf *.o lib/*.o

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
similarity index 93%
rename from app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild
rename to app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
index 9ac20aa4527..f7b5d30fab9 100644
--- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
@@ -19,7 +19,7 @@ DEPEND=""
 RDEPEND="app-admin/ryzen_smu"
 
 PATCHES=(
-	"${FILESDIR}"/CFLAGS_override_fix.patch
+	"${FILESDIR}"/fix-Makefile.patch
 )
 
 src_compile() {