summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Karbowski <slashbeast@gentoo.org>2021-09-14 23:08:28 +0200
committerPiotr Karbowski <slashbeast@gentoo.org>2021-09-15 00:04:21 +0200
commitb67f3c23744d8b66f299b3202e3fb68f7df78740 (patch)
tree2937c6587a4c326e484aba6011498921cb8826c6
parentapp-admin/ryzen_smu: Fix CC when actually crosscompilling. (diff)
downloadgentoo-b67f3c23744d8b66f299b3202e3fb68f7df78740.tar.gz
gentoo-b67f3c23744d8b66f299b3202e3fb68f7df78740.tar.bz2
gentoo-b67f3c23744d8b66f299b3202e3fb68f7df78740.zip
app-admin/ryzen_monitor: 1.0.4-r1: fix issues around Makefile.
Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>
-rw-r--r--app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch13
-rw-r--r--app-admin/ryzen_monitor/files/fix-Makefile.patch26
-rw-r--r--app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild (renamed from app-admin/ryzen_monitor/ryzen_monitor-1.0.4.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
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() {