1 |
commit: d523c2051222bb5ab591efe8f1abc03508bdc4d5 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 30 02:16:14 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 30 02:16:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d523c205 |
7 |
|
8 |
www-client/firefox: fix gold linker deps |
9 |
|
10 |
Closes: https://bugs.gentoo.org/732712 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
www-client/firefox/firefox-78.3.0.ebuild | 9 +++++---- |
15 |
www-client/firefox/firefox-81.0.ebuild | 9 +++++---- |
16 |
2 files changed, 10 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/www-client/firefox/firefox-78.3.0.ebuild b/www-client/firefox/firefox-78.3.0.ebuild |
19 |
index 929abb983b8..836f98d925a 100644 |
20 |
--- a/www-client/firefox/firefox-78.3.0.ebuild |
21 |
+++ b/www-client/firefox/firefox-78.3.0.ebuild |
22 |
@@ -64,23 +64,24 @@ BDEPEND="${PYTHON_DEPS} |
23 |
|| ( |
24 |
( |
25 |
sys-devel/clang:10 |
26 |
- !clang? ( sys-devel/llvm:10 ) |
27 |
+ sys-devel/llvm:10 |
28 |
clang? ( |
29 |
=sys-devel/lld-10* |
30 |
- sys-devel/llvm:10[gold] |
31 |
pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) |
32 |
) |
33 |
) |
34 |
( |
35 |
sys-devel/clang:9 |
36 |
- !clang? ( sys-devel/llvm:9 ) |
37 |
+ sys-devel/llvm:9 |
38 |
clang? ( |
39 |
=sys-devel/lld-9* |
40 |
- sys-devel/llvm:9[gold] |
41 |
pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) |
42 |
) |
43 |
) |
44 |
) |
45 |
+ lto? ( |
46 |
+ !clang? ( sys-devel/binutils[gold] ) |
47 |
+ ) |
48 |
amd64? ( >=dev-lang/yasm-1.1 ) |
49 |
x86? ( >=dev-lang/yasm-1.1 ) |
50 |
!system-av1? ( |
51 |
|
52 |
diff --git a/www-client/firefox/firefox-81.0.ebuild b/www-client/firefox/firefox-81.0.ebuild |
53 |
index 9726164d813..a50c10d39d5 100644 |
54 |
--- a/www-client/firefox/firefox-81.0.ebuild |
55 |
+++ b/www-client/firefox/firefox-81.0.ebuild |
56 |
@@ -64,23 +64,24 @@ BDEPEND="${PYTHON_DEPS} |
57 |
|| ( |
58 |
( |
59 |
sys-devel/clang:10 |
60 |
- !clang? ( sys-devel/llvm:10 ) |
61 |
+ sys-devel/llvm |
62 |
clang? ( |
63 |
=sys-devel/lld-10* |
64 |
- sys-devel/llvm:10[gold] |
65 |
pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) |
66 |
) |
67 |
) |
68 |
( |
69 |
sys-devel/clang:9 |
70 |
- !clang? ( sys-devel/llvm:9 ) |
71 |
+ sys-devel/llvm:9 |
72 |
clang? ( |
73 |
=sys-devel/lld-9* |
74 |
- sys-devel/llvm:9[gold] |
75 |
pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) |
76 |
) |
77 |
) |
78 |
) |
79 |
+ lto? ( |
80 |
+ !clang? ( sys-devel/binutils[gold] ) |
81 |
+ ) |
82 |
amd64? ( >=dev-lang/yasm-1.1 ) |
83 |
x86? ( >=dev-lang/yasm-1.1 ) |
84 |
!system-av1? ( |