From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CBA41581D3 for ; Wed, 15 May 2024 07:23:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34654E29B0; Wed, 15 May 2024 07:23:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09615E29B0 for ; Wed, 15 May 2024 07:23:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B679633BEBE for ; Wed, 15 May 2024 07:23:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F265F1A80 for ; Wed, 15 May 2024 07:23:37 +0000 (UTC) From: "Joe Kappus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joe Kappus" Message-ID: <1715757726.e5c92ddd9f009b25f033d77bc860ad33528e3f62.joe@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-power/linux-tools-power-x86/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch X-VCS-Directories: sys-power/linux-tools-power-x86/files/ X-VCS-Committer: joe X-VCS-Committer-Name: Joe Kappus X-VCS-Revision: e5c92ddd9f009b25f033d77bc860ad33528e3f62 X-VCS-Branch: dev Date: Wed, 15 May 2024 07:23:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c87cbaa8-70ec-4f21-affc-1faef5daf360 X-Archives-Hash: cc0ec9801e3b23ce9299009cc7211074 commit: e5c92ddd9f009b25f033d77bc860ad33528e3f62 Author: Joe Kappus wt gd> AuthorDate: Wed May 15 07:19:30 2024 +0000 Commit: Joe Kappus wt gd> CommitDate: Wed May 15 07:22:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e5c92ddd sys-power/linux-tools-power-x86/files: drop -D_FORTIFY_SOURCE=2 from CFLAGS Closes: https://bugs.gentoo.org/931935 Signed-off-by: Joe Kappus wt.gd> .../files/linux-tools-power-x86-6.1-cflags.patch | 33 ++++++++++++++-------- .../files/linux-tools-power-x86-6.6-cflags.patch | 16 +++++++---- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch index 499bbce0d6..8de8139d85 100644 --- a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch +++ b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.1-cflags.patch @@ -1,7 +1,8 @@ -diff -urN a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile ---- a/tools/power/x86/intel-speed-select/Makefile 2022-12-11 17:15:18.000000000 -0500 -+++ b/tools/power/x86/intel-speed-select/Makefile 2023-02-04 05:47:25.961523494 -0500 -@@ -13,7 +13,7 @@ +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 @@ endif # Do not use make's built-in rules # (this improves performance and avoids hard-to-debug behaviour); MAKEFLAGS += -r @@ -10,10 +11,11 @@ diff -urN a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel- override LDFLAGS += -lnl-genl-3 -lnl-3 ALL_TARGETS := intel-speed-select -diff -urN a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile ---- a/tools/power/x86/turbostat/Makefile 2022-12-11 17:15:18.000000000 -0500 -+++ b/tools/power/x86/turbostat/Makefile 2023-02-04 05:49:01.960951027 -0500 -@@ -9,7 +9,7 @@ +diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile +index 92e139b9c792..d2c21035e16d 100644 +--- a/tools/power/x86/turbostat/Makefile ++++ b/tools/power/x86/turbostat/Makefile +@@ -9,11 +9,10 @@ ifeq ("$(origin O)", "command line") endif turbostat : turbostat.c @@ -22,10 +24,15 @@ diff -urN a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makef 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 -urN a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile ---- a/tools/power/x86/x86_energy_perf_policy/Makefile 2022-12-11 17:15:18.000000000 -0500 -+++ b/tools/power/x86/x86_energy_perf_policy/Makefile 2023-02-04 05:47:25.962523488 -0500 -@@ -9,7 +9,6 @@ +-override CFLAGS += -D_FORTIFY_SOURCE=2 + + %: %.c + @mkdir -p $(BUILD_OUTPUT) +diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile +index 666b325a62a2..1fdeef864e7c 100644 +--- a/tools/power/x86/x86_energy_perf_policy/Makefile ++++ b/tools/power/x86/x86_energy_perf_policy/Makefile +@@ -9,9 +9,8 @@ ifeq ("$(origin O)", "command line") endif x86_energy_perf_policy : x86_energy_perf_policy.c @@ -34,3 +41,5 @@ diff -urN a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x8 override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' -override CFLAGS += -D_FORTIFY_SOURCE=2 + %: %.c + @mkdir -p $(BUILD_OUTPUT) diff --git a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch index 111fb1a888..8de8139d85 100644 --- a/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch +++ b/sys-power/linux-tools-power-x86/files/linux-tools-power-x86-6.6-cflags.patch @@ -12,10 +12,10 @@ index 7221f2f55e8b..96b5a456a4c5 100644 ALL_TARGETS := intel-speed-select diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile -index 92e139b9c792..972fb3c5a514 100644 +index 92e139b9c792..d2c21035e16d 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile -@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line") +@@ -9,11 +9,10 @@ ifeq ("$(origin O)", "command line") endif turbostat : turbostat.c @@ -24,16 +24,22 @@ index 92e139b9c792..972fb3c5a514 100644 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 +-override CFLAGS += -D_FORTIFY_SOURCE=2 + + %: %.c + @mkdir -p $(BUILD_OUTPUT) diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile -index 666b325a62a2..0053893229fb 100644 +index 666b325a62a2..1fdeef864e7c 100644 --- a/tools/power/x86/x86_energy_perf_policy/Makefile +++ b/tools/power/x86/x86_energy_perf_policy/Makefile -@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line") +@@ -9,9 +9,8 @@ ifeq ("$(origin O)", "command line") endif x86_energy_perf_policy : x86_energy_perf_policy.c -override CFLAGS += -O2 -Wall -I../../../include +override CFLAGS += -Wall -I../../../include override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' - override CFLAGS += -D_FORTIFY_SOURCE=2 +-override CFLAGS += -D_FORTIFY_SOURCE=2 + %: %.c + @mkdir -p $(BUILD_OUTPUT)