commit:     20eab5991c298a53c2df138bee99463dfb88c4d7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 16:46:57 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 19:21:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20eab599

www-client/firefox: --disable-elf-hack is not supported on arm64

Fixes

  0:23.63 mozbuild.configure.options.InvalidOptionError: --disable-elf-hack is 
not available in this configuration

as seen on arm64.

Link: 
https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f10361660904dd392c6fe7f07a5cdf99ba91e2ea
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/firefox-68.5.0.ebuild | 2 +-
 www-client/firefox/firefox-68.6.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/firefox/firefox-68.5.0.ebuild 
b/www-client/firefox/firefox-68.5.0.ebuild
index 50337cc6651..4b8f2519a86 100644
--- a/www-client/firefox/firefox-68.5.0.ebuild
+++ b/www-client/firefox/firefox-68.5.0.ebuild
@@ -570,7 +570,7 @@ src_configure() {
        # when they would normally be larger than 2GiB.
        append-ldflags "-Wl,--compress-debug-sections=zlib"
 
-       if use clang ; then
+       if use clang && ! use arm64; 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

diff --git a/www-client/firefox/firefox-68.6.0.ebuild 
b/www-client/firefox/firefox-68.6.0.ebuild
index 3b50e731772..546fb2cae1d 100644
--- a/www-client/firefox/firefox-68.6.0.ebuild
+++ b/www-client/firefox/firefox-68.6.0.ebuild
@@ -570,7 +570,7 @@ src_configure() {
        # when they would normally be larger than 2GiB.
        append-ldflags "-Wl,--compress-debug-sections=zlib"
 
-       if use clang ; then
+       if use clang && ! use arm64; 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

Reply via email to