commit: cc7c8229481e752e3a79095931f0823f04ad7e14 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Mon Jun 5 11:03:32 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Jun 5 11:04:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7c8229
app-benchmarks/stress-ng: dont redefine fortify source Closes: https://bugs.gentoo.org/906005 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/stress-ng-0.15.08-fortify-source.patch | 29 ++++++++++++++++++++++ ...-0.15.08.ebuild => stress-ng-0.15.08-r1.ebuild} | 2 ++ 2 files changed, 31 insertions(+) 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 new file mode 100644 index 000000000000..7b8a75c44766 --- /dev/null +++ b/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch @@ -0,0 +1,29 @@ +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 diff --git a/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild similarity index 94% rename from app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild rename to app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild index 12a6f5017085..28539472ec24 100644 --- a/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild +++ b/app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild @@ -34,6 +34,8 @@ RDEPEND="${DEPEND}" DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" ) +PATCHES=( "${FILESDIR}/${PN}-0.15.08-fortify-source.patch" ) + pkg_pretend() { if use apparmor; then CONFIG_CHECK="SECURITY_APPARMOR"
