| 1 |
commit: 106c77dfb13c28304c74c3e07e8bf146e8c3b282 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 4 00:15:49 2015 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 4 00:15:49 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=106c77df |
| 7 |
|
| 8 |
Adjusted jit config options between ebuilds and eclass |
| 9 |
|
| 10 |
eclass/mozconfig-v5.36.eclass | 4 +++- |
| 11 |
www-client/firefox/firefox-36.0.ebuild | 4 ---- |
| 12 |
www-client/firefox/firefox-37.0_beta1.ebuild | 4 ---- |
| 13 |
3 files changed, 3 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mozconfig-v5.36.eclass b/eclass/mozconfig-v5.36.eclass |
| 16 |
index 7959064..0cab858 100644 |
| 17 |
--- a/eclass/mozconfig-v5.36.eclass |
| 18 |
+++ b/eclass/mozconfig-v5.36.eclass |
| 19 |
@@ -184,7 +184,9 @@ mozconfig_config() { |
| 20 |
|
| 21 |
if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then |
| 22 |
mozconfig_use_enable jit ion |
| 23 |
- mozconfig_use_enable jit yarr-jit |
| 24 |
+ # Force jit simulators for mips and arm |
| 25 |
+ use jit && use arm && mozconfig_annotate '' --enable-arm-simulator |
| 26 |
+ use jit && use mips && mozconfig_annotate '' --enable-mips-simulator |
| 27 |
fi |
| 28 |
|
| 29 |
# These are enabled by default in all mozilla applications |
| 30 |
|
| 31 |
diff --git a/www-client/firefox/firefox-36.0.ebuild b/www-client/firefox/firefox-36.0.ebuild |
| 32 |
index a3cc92f..69c577e 100644 |
| 33 |
--- a/www-client/firefox/firefox-36.0.ebuild |
| 34 |
+++ b/www-client/firefox/firefox-36.0.ebuild |
| 35 |
@@ -224,10 +224,6 @@ src_configure() { |
| 36 |
# Other ff-specific settings |
| 37 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 38 |
|
| 39 |
- # Force jit simulators for mips and arm |
| 40 |
- use jit && use arm && mozconfig_annotate '' --enable-arm-simulator |
| 41 |
- use jit && use mips && mozconfig_annotate '' --enable-mips-simulator |
| 42 |
- |
| 43 |
# Allow for a proper pgo build |
| 44 |
if use pgo; then |
| 45 |
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig |
| 46 |
|
| 47 |
diff --git a/www-client/firefox/firefox-37.0_beta1.ebuild b/www-client/firefox/firefox-37.0_beta1.ebuild |
| 48 |
index 7acd903..813338e 100644 |
| 49 |
--- a/www-client/firefox/firefox-37.0_beta1.ebuild |
| 50 |
+++ b/www-client/firefox/firefox-37.0_beta1.ebuild |
| 51 |
@@ -223,10 +223,6 @@ src_configure() { |
| 52 |
# Other ff-specific settings |
| 53 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 54 |
|
| 55 |
- # Force jit simulators for mips and arm |
| 56 |
- use jit && use arm && mozconfig_annotate '' --enable-arm-simulator |
| 57 |
- use jit && use mips && mozconfig_annotate '' --enable-mips-simulator |
| 58 |
- |
| 59 |
# Allow for a proper pgo build |
| 60 |
if use pgo; then |
| 61 |
echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig |
Archives