From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A299138359 for ; Fri, 3 Jul 2020 11:11:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DA09E088C; Fri, 3 Jul 2020 11:11:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43831E088C for ; Fri, 3 Jul 2020 11:11:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1FA934EDA7 for ; Fri, 3 Jul 2020 11:11:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4280B9C for ; Fri, 3 Jul 2020 11:11:41 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1593774694.8ba4f3d0f38b11701e4dc47d35bd106d5f7b7a2f.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-78.0.1.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 8ba4f3d0f38b11701e4dc47d35bd106d5f7b7a2f X-VCS-Branch: master Date: Fri, 3 Jul 2020 11:11:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69fd7c59-8f6e-471d-870b-87ee17a7f3a1 X-Archives-Hash: 235264ca8e2c71f6572360cc3ea1d57e commit: 8ba4f3d0f38b11701e4dc47d35bd106d5f7b7a2f Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jul 3 01:08:06 2020 +0000 Commit: Thomas Deutschmann gentoo 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/16555 Signed-off-by: Thomas Deutschmann 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