From cc7c8229481e752e3a79095931f0823f04ad7e14 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Mon, 5 Jun 2023 13:03:32 +0200 Subject: app-benchmarks/stress-ng: dont redefine fortify source Closes: https://bugs.gentoo.org/906005 Signed-off-by: Conrad Kostecki --- .../files/stress-ng-0.15.08-fortify-source.patch | 29 +++++++++++ .../stress-ng/stress-ng-0.15.08-r1.ebuild | 58 ++++++++++++++++++++++ app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild | 56 --------------------- 3 files changed, 87 insertions(+), 56 deletions(-) create mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch create mode 100644 app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild delete mode 100644 app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild (limited to 'app-benchmarks') 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 +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 +--- + 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-r1.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild new file mode 100644 index 000000000000..28539472ec24 --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info toolchain-funcs + +DESCRIPTION="Stress test for a computer system with various selectable ways" +HOMEPAGE="https://github.com/ColinIanKing/stress-ng" +SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="apparmor sctp" + +DEPEND=" + dev-libs/libaio + dev-libs/libbsd + dev-libs/libgcrypt:0= + sys-apps/attr + sys-apps/keyutils:= + sys-libs/libcap + sys-libs/zlib + virtual/libcrypt:= + apparmor? ( + sys-apps/apparmor-utils + sys-libs/libapparmor + ) + sctp? ( net-misc/lksctp-tools ) +" + +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" + check_extra_config + fi +} + +src_compile() { + tc-export CC + + export MAN_COMPRESS="0" + + local myemakeopts=( + HAVE_APPARMOR="$(usex apparmor 1 0)" + HAVE_LIB_SCTP="$(usex sctp 1 0)" + VERBOSE="1" + ) + + emake "${myemakeopts[@]}" +} diff --git a/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild deleted file mode 100644 index 12a6f5017085..000000000000 --- a/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info toolchain-funcs - -DESCRIPTION="Stress test for a computer system with various selectable ways" -HOMEPAGE="https://github.com/ColinIanKing/stress-ng" -SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" -IUSE="apparmor sctp" - -DEPEND=" - dev-libs/libaio - dev-libs/libbsd - dev-libs/libgcrypt:0= - sys-apps/attr - sys-apps/keyutils:= - sys-libs/libcap - sys-libs/zlib - virtual/libcrypt:= - apparmor? ( - sys-apps/apparmor-utils - sys-libs/libapparmor - ) - sctp? ( net-misc/lksctp-tools ) -" - -RDEPEND="${DEPEND}" - -DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" ) - -pkg_pretend() { - if use apparmor; then - CONFIG_CHECK="SECURITY_APPARMOR" - check_extra_config - fi -} - -src_compile() { - tc-export CC - - export MAN_COMPRESS="0" - - local myemakeopts=( - HAVE_APPARMOR="$(usex apparmor 1 0)" - HAVE_LIB_SCTP="$(usex sctp 1 0)" - VERBOSE="1" - ) - - emake "${myemakeopts[@]}" -} -- cgit v1.2.3-65-gdbad