Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/
Date: Tue, 10 May 2022 01:37:18
Message-Id: 1652146624.db5b45315b4827253e52bbc1460ac0fbe615708c.sam@gentoo
1 commit: db5b45315b4827253e52bbc1460ac0fbe615708c
2 Author: Myckel Habets <gentoo-bugs <AT> habets-dobben <DOT> nl>
3 AuthorDate: Sun May 8 08:23:57 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 10 01:37:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5b4531
7
8 www-client/seamonkey: enable elf hack on architectures that support it
9
10 The old implementation, just disabled elf hack by default. Now we enable this
11 where it is enabled by default by seamonkey itself. According to firefox
12 this breaks with clang, so we copied over the check that firefox uses
13 to disable it on clang builds.
14
15 Bug: https://bugs.gentoo.org/836319
16 Signed-off-by: Myckel Habets <gentoo-bugs <AT> habets-dobben.nl>
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 www-client/seamonkey/seamonkey-2.53.12.ebuild | 24 ++++++++++++++++++++++--
20 1 file changed, 22 insertions(+), 2 deletions(-)
21
22 diff --git a/www-client/seamonkey/seamonkey-2.53.12.ebuild b/www-client/seamonkey/seamonkey-2.53.12.ebuild
23 index 4c512efa8daf..ca32eb5a0b66 100644
24 --- a/www-client/seamonkey/seamonkey-2.53.12.ebuild
25 +++ b/www-client/seamonkey/seamonkey-2.53.12.ebuild
26 @@ -393,8 +393,28 @@ src_configure() {
27 # use startup-cache for faster startup time
28 mozconfig_annotate '' --enable-startupcache
29
30 - # Broken on some arches
31 - mozconfig_annotate '' --disable-elf-hack
32 + # Elf hack should be enabled by default on architectures that support it.
33 + # On archs that don't support it, it should not be enabled by default.
34 + # www-client/firefox says building with clang breaks elf hack on archs that
35 + # support it, so they disable that. We assume this is the same for www-client/seamonkey.
36 + # The code below is copied over from www-client/firefox.
37 + if tc-is-clang ; then
38 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
39 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
40 + # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
41 + local disable_elf_hack=
42 + if use amd64 ; then
43 + disable_elf_hack=yes
44 + elif use x86 ; then
45 + disable_elf_hack=yes
46 + elif use arm ; then
47 + disable_elf_hack=yes
48 + fi
49 +
50 + if [[ -n ${disable_elf_hack} ]] ; then
51 + mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
52 + fi
53 + fi
54
55 # Disabled by default. See bug 836319 , comment 17.
56 if ! use webrtc ; then