aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Kappus <joe@wt.gd>2024-05-14 04:48:54 -0400
committerJoe Kappus <joe@wt.gd>2024-05-14 04:50:37 -0400
commit795b8fd5bed35989ef2520b35d735b72f71ba7d4 (patch)
tree449082614299a1b0ab474e02e35dfcd8437d09cd /sys-power/linux-tools-power-x86/files
parentsys-power/linux-tools-power-x86: drop 5.18 (diff)
downloadguru-795b8fd5bed35989ef2520b35d735b72f71ba7d4.tar.gz
guru-795b8fd5bed35989ef2520b35d735b72f71ba7d4.tar.bz2
guru-795b8fd5bed35989ef2520b35d735b72f71ba7d4.zip
sys-power/linux-tools-power-x86: add 6.6, fix cflags
Closes: https://bugs.gentoo.org/901453 Closes: https://bugs.gentoo.org/931485 Signed-off-by: Joe Kappus <joe@wt.gd>
Diffstat (limited to 'sys-power/linux-tools-power-x86/files')
-rw-r--r--sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch (renamed from sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch)18
1 files changed, 12 insertions, 6 deletions
diff --git a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch
index 700baa781..111fb1a88 100644
--- a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-5.18-cflags.patch
+++ b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch
@@ -1,28 +1,34 @@
+diff --git a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile
+index 7221f2f55e8b..96b5a456a4c5 100644
--- a/tools/power/x86/intel-speed-select/Makefile
+++ b/tools/power/x86/intel-speed-select/Makefile
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ endif
# Do not use make's built-in rules
# (this improves performance and avoids hard-to-debug behaviour);
MAKEFLAGS += -r
-override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -I/usr/include/libnl3
-+override CFLAGS += -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -I/usr/include/libnl3
++override CFLAGS += -Wall -D_GNU_SOURCE -I$(OUTPUT)include -I/usr/include/libnl3
override LDFLAGS += -lnl-genl-3 -lnl-3
ALL_TARGETS := intel-speed-select
+diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
+index 92e139b9c792..972fb3c5a514 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line")
endif
turbostat : turbostat.c
--override CFLAGS += -O2 -Wall -I../../../include
-+override CFLAGS += -Wall -I../../../include
+-override CFLAGS += -O2 -Wall -Wextra -I../../../include
++override CFLAGS += -Wall -Wextra -I../../../include
override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
override CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
override CFLAGS += -D_FILE_OFFSET_BITS=64
+diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile
+index 666b325a62a2..0053893229fb 100644
--- a/tools/power/x86/x86_energy_perf_policy/Makefile
+++ b/tools/power/x86/x86_energy_perf_policy/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line")
endif
x86_energy_perf_policy : x86_energy_perf_policy.c