commit: d094dd12e83313941d9936cdaa89b62dde62035e Author: Matthew Smith <matthew <AT> gentoo <DOT> org> AuthorDate: Fri Sep 1 17:17:18 2023 +0000 Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> CommitDate: Fri Sep 1 17:21:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d094dd12
net-misc/xmrig: filter FORTIFY_SOURCE=3 Closes: https://bugs.gentoo.org/913420 Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> .../xmrig/{xmrig-6.18.1-r1.ebuild => xmrig-6.18.1-r2.ebuild} | 9 ++++++++- net-misc/xmrig/{xmrig-6.20.0.ebuild => xmrig-6.20.0-r1.ebuild} | 9 ++++++++- net-misc/xmrig/xmrig-9999.ebuild | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/net-misc/xmrig/xmrig-6.18.1-r1.ebuild b/net-misc/xmrig/xmrig-6.18.1-r2.ebuild similarity index 85% rename from net-misc/xmrig/xmrig-6.18.1-r1.ebuild rename to net-misc/xmrig/xmrig-6.18.1-r2.ebuild index 89809b2e8627..7152c4ad7635 100644 --- a/net-misc/xmrig/xmrig-6.18.1-r1.ebuild +++ b/net-misc/xmrig/xmrig-6.18.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake systemd +inherit cmake flag-o-matic systemd toolchain-funcs DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"; @@ -45,6 +45,13 @@ src_prepare() { } src_configure() { + # JIT broken with FORTIFY_SOURCE=3 + # Bug #913420 + if tc-enables-fortify-source; then + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + local mycmakeargs=( -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) -DWITH_HWLOC=$(usex hwloc) diff --git a/net-misc/xmrig/xmrig-6.20.0.ebuild b/net-misc/xmrig/xmrig-6.20.0-r1.ebuild similarity index 84% rename from net-misc/xmrig/xmrig-6.20.0.ebuild rename to net-misc/xmrig/xmrig-6.20.0-r1.ebuild index 7f9e7dd2397c..a36872e00718 100644 --- a/net-misc/xmrig/xmrig-6.20.0.ebuild +++ b/net-misc/xmrig/xmrig-6.20.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake systemd +inherit cmake flag-o-matic systemd toolchain-funcs DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"; @@ -44,6 +44,13 @@ src_prepare() { } src_configure() { + # JIT broken with FORTIFY_SOURCE=3 + # Bug #913420 + if tc-enables-fortify-source; then + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + local mycmakeargs=( -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) -DWITH_HWLOC=$(usex hwloc) diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild index 7f9e7dd2397c..a36872e00718 100644 --- a/net-misc/xmrig/xmrig-9999.ebuild +++ b/net-misc/xmrig/xmrig-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake systemd +inherit cmake flag-o-matic systemd toolchain-funcs DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"; @@ -44,6 +44,13 @@ src_prepare() { } src_configure() { + # JIT broken with FORTIFY_SOURCE=3 + # Bug #913420 + if tc-enables-fortify-source; then + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + local mycmakeargs=( -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) -DWITH_HWLOC=$(usex hwloc)
