Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
Date: Sat, 14 Sep 2019 20:35:08
Message-Id: 1568493288.579dc2f7b864d9192d0e1b8a7ee6733c7a9ac992.anarchy@gentoo
1 commit: 579dc2f7b864d9192d0e1b8a7ee6733c7a9ac992
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 20:34:48 2019 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 20:34:48 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=579dc2f7
7
8 www-client/firefox: Fix lto builds
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
12
13 www-client/firefox/firefox-69.0-r1.ebuild | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/www-client/firefox/firefox-69.0-r1.ebuild b/www-client/firefox/firefox-69.0-r1.ebuild
17 index 4e89b4f..52dfab5 100644
18 --- a/www-client/firefox/firefox-69.0-r1.ebuild
19 +++ b/www-client/firefox/firefox-69.0-r1.ebuild
20 @@ -257,7 +257,7 @@ src_unpack() {
21 src_prepare() {
22 use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
23 eapply "${WORKDIR}/firefox"
24 - eapply "${FILESDIR}${PN}-69.0-lto-gcc-fix.patch"
25 + eapply "${FILESDIR}/${PN}-69.0-lto-gcc-fix.patch"
26
27 # Allow user to apply any additional patches without modifing ebuild
28 eapply_user
29 @@ -429,7 +429,7 @@ src_configure() {
30 if use clang ; then
31 # This is upstream's default
32 mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
33 - elif tc-ld-is-gold || use lto ; then
34 + elif tc-ld-is-gold ; then
35 mozconfig_annotate "linker is set to gold" --enable-linker=gold
36 else
37 mozconfig_annotate "linker is set to bfd" --enable-linker=bfd