commit: 83d0d2ab2be891fff36a10105a6b25441733ba19 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Jun 26 17:16:17 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Jul 2 01:34:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d0d2ab
app-benchmarks/stress-ng: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31625 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/stress-ng-0.15.08-fortify-source.patch | 29 ---------------------- 1 file changed, 29 deletions(-) diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch b/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch deleted file mode 100644 index 7b8a75c44766..000000000000 --- a/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 967f8f4ff467e7d15b7cdf12f3e2f786e5e19375 Mon Sep 17 00:00:00 2001 -From: Colin Ian King <[email protected]> -Date: Wed, 31 May 2023 20:15:54 +0100 -Subject: [PATCH] Makefile: always undefine _FORTIFY_SOURCE before defining it - -Gentoo seems to define _FORTIFY_SOURCE in the build environment for -some specific build options and we end up with duplicated define -warnings. Undefine it before defining it. - -Closes https://github.com/ColinIanKing/stress-ng/issues/291 - -Signed-off-by: Colin Ian King <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e08d60ea..693010e1 100644 ---- a/Makefile -+++ b/Makefile -@@ -59,7 +59,7 @@ CFLAGS += -Werror=format-security - endif - ifneq ($(findstring pcc,$(CC)),pcc) - ifeq ($(shell $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -E -xc /dev/null > /dev/null 2>& 1 && echo 1),1) --CFLAGS += -D_FORTIFY_SOURCE=2 -+CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 - endif - endif - endif
