commit: 7b392831019eb177fc3579e62343c251067d0ec8 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Sun Mar 24 17:37:30 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Mar 24 17:39:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b392831
mail-client/thunderbird: handle "-z,pack-relative-relocs" like in ff Closes: https://bugs.gentoo.org/916405 Closes: https://bugs.gentoo.org/927559 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> mail-client/thunderbird/thunderbird-115.9.0.ebuild | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-115.9.0.ebuild b/mail-client/thunderbird/thunderbird-115.9.0.ebuild index 001417ed45f6..ecb7939f2ef7 100644 --- a/mail-client/thunderbird/thunderbird-115.9.0.ebuild +++ b/mail-client/thunderbird/thunderbird-115.9.0.ebuild @@ -1011,26 +1011,14 @@ src_configure() { fi fi - if use clang ; then - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822 - # toolkit/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_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack - fi - fi - - if use elibc_musl && use arm64 ; then - mozconfig_add_options_ac 'elf-hack is broken when using musl/arm64' --disable-elf-hack + # With profile 23.0 elf-hack=legacy is broken with gcc. + # With Firefox-115esr elf-hack=relr isn't available (only in rapid). + # Solution: Disable build system's elf-hack completely, and add "-z,pack-relative-relocs" + # manually with gcc. + mozconfig_add_options_ac 'elf-hack disabled' --disable-elf-hack + + if use amd64 || use x86 ; then + ! use clang && append-ldflags "-z,pack-relative-relocs" fi # Additional ARCH support
