From 15d8a2f6533a2b51fa6801b3fe69bdbb755651fd Mon Sep 17 00:00:00 2001 From: Stephan Hartmann Date: Sat, 18 Jun 2022 15:57:04 +0200 Subject: [PATCH] www-client/chromium: fix build on arm64 without crc extension Closes: https://bugs.gentoo.org/851639 Signed-off-by: Stephan Hartmann --- www-client/chromium/chromium-102.0.5005.115.ebuild | 6 ++++++ www-client/chromium/chromium-103.0.5060.53.ebuild | 6 ++++++ www-client/chromium/chromium-104.0.5110.0.ebuild | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/www-client/chromium/chromium-102.0.5005.115.ebuild b/www-client/chromium/chromium-102.0.5005.115.ebuild index 82566d5c82b9b..f6aec029a3819 100644 --- a/www-client/chromium/chromium-102.0.5005.115.ebuild +++ b/www-client/chromium/chromium-102.0.5005.115.ebuild @@ -850,6 +850,12 @@ src_configure() { myconf_gn+=" symbol_level=0" fi + # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639 + if use arm64 && tc-is-gcc; then + sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \ + third_party/crc32c/src/src/crc32c_arm64.cc || die + fi + einfo "Configuring Chromium..." set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release echo "$@" diff --git a/www-client/chromium/chromium-103.0.5060.53.ebuild b/www-client/chromium/chromium-103.0.5060.53.ebuild index ffeca13f66fd3..cafad16fc39a0 100644 --- a/www-client/chromium/chromium-103.0.5060.53.ebuild +++ b/www-client/chromium/chromium-103.0.5060.53.ebuild @@ -927,6 +927,12 @@ src_configure() { myconf_gn+=" symbol_level=0" fi + # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639 + if use arm64 && tc-is-gcc; then + sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \ + third_party/crc32c/src/src/crc32c_arm64.cc || die + fi + einfo "Configuring Chromium..." set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release echo "$@" diff --git a/www-client/chromium/chromium-104.0.5110.0.ebuild b/www-client/chromium/chromium-104.0.5110.0.ebuild index 64b7e13cd82b7..95391b14d5a17 100644 --- a/www-client/chromium/chromium-104.0.5110.0.ebuild +++ b/www-client/chromium/chromium-104.0.5110.0.ebuild @@ -949,6 +949,12 @@ chromium_configure() { myconf_gn+=" chrome_pgo_phase=0" fi + # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639 + if use arm64 && tc-is-gcc; then + sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \ + third_party/crc32c/src/src/crc32c_arm64.cc || die + fi + einfo "Configuring Chromium..." set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release echo "$@"