1 |
commit: aa16fff9832d0a21149abb2e090252cc9a5bcb51 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 29 19:00:04 2017 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 29 19:00:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=aa16fff9 |
7 |
|
8 |
drop gold USE flag and honour whatever binutils-config has set |
9 |
|
10 |
eclass/mozconfig-v6.56.eclass | 12 ++++++++---- |
11 |
www-client/firefox/metadata.xml | 1 - |
12 |
2 files changed, 8 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/eclass/mozconfig-v6.56.eclass b/eclass/mozconfig-v6.56.eclass |
15 |
index 53057f0..c0ecf59 100644 |
16 |
--- a/eclass/mozconfig-v6.56.eclass |
17 |
+++ b/eclass/mozconfig-v6.56.eclass |
18 |
@@ -84,7 +84,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v5 |
19 |
# Set the variable to any value if the use flag should exist but not be default-enabled. |
20 |
|
21 |
# use-flags common among all mozilla ebuilds |
22 |
-IUSE="${IUSE} dbus debug gold neon pulseaudio selinux startup-notification system-harfbuzz |
23 |
+IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification system-harfbuzz |
24 |
system-icu system-jpeg system-libevent system-sqlite system-libvpx" |
25 |
|
26 |
# some notes on deps: |
27 |
@@ -197,14 +197,18 @@ mozconfig_config() { |
28 |
--with-system-zlib \ |
29 |
--with-system-bz2 |
30 |
|
31 |
- # Disable for testing purposes only |
32 |
- mozconfig_annotate 'Upstream bug 1341234' --disable-stylo |
33 |
+ # Disable for testing purposes only |
34 |
+ mozconfig_annotate 'Upstream bug 1341234' --disable-stylo |
35 |
|
36 |
# Must pass release in order to properly select linker via gold useflag |
37 |
mozconfig_annotate 'Enable by Gentoo' --enable-release |
38 |
|
39 |
# Must pass --enable-gold if using ld.gold |
40 |
- mozconfig_use_enable gold |
41 |
+ if tc-ld-is-gold ; then |
42 |
+ mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold |
43 |
+ else |
44 |
+ mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold |
45 |
+ fi |
46 |
|
47 |
if has bindist ${IUSE}; then |
48 |
mozconfig_use_enable !bindist official-branding |
49 |
|
50 |
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml |
51 |
index a338b44..66af8a4 100644 |
52 |
--- a/www-client/firefox/metadata.xml |
53 |
+++ b/www-client/firefox/metadata.xml |
54 |
@@ -14,7 +14,6 @@ |
55 |
<flag name="gtk2">Use the cairo-gtk2 rendering engine</flag> |
56 |
<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically |
57 |
downloaded and kept up-to-date in user profiles</flag> |
58 |
- <flag name="gold">Enable use of ld.gold linker</flag> |
59 |
<flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag> |
60 |
<flag name="jemalloc">Enable or disable jemalloc</flag> |
61 |
<flag name="pgo">Add support for profile-guided optimization using gcc-4.5, |