commit: 8ba4f3d0f38b11701e4dc47d35bd106d5f7b7a2f Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Fri Jul 3 01:08:06 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Jul 3 11:11:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba4f3d0
www-client/firefox: pass --disable-elf-hack only on supported arches Bug: https://bugs.gentoo.org/727040 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/16555 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> www-client/firefox/firefox-78.0.1.ebuild | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/www-client/firefox/firefox-78.0.1.ebuild b/www-client/firefox/firefox-78.0.1.ebuild index 739b43305bf..2fe29a4b717 100644 --- a/www-client/firefox/firefox-78.0.1.ebuild +++ b/www-client/firefox/firefox-78.0.1.ebuild @@ -581,10 +581,22 @@ src_configure() { # when they would normally be larger than 2GiB. append-ldflags "-Wl,--compress-debug-sections=zlib" - if use clang && ! use arm64; then + if use clang ; then # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822 - mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack + # moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64') + local disable_elf_hack= + if use amd64 ; then + disable_elf_hack=yes + elif use x86 ; then + disable_elf_hack=yes + elif use arm ; then + disable_elf_hack=yes + fi + + if [[ -n ${disable_elf_hack} ]] ; then + mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack + fi fi echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
