[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, eclass/

["git@oystercatcher mirror+tproxy" <git@oystercatcher.gentoo.org>]

commit:     106c77dfb13c28304c74c3e07e8bf146e8c3b282
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  4 00:15:49 2015 +0000
Commit:     git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT> gentoo <DOT> org>
CommitDate: Wed Mar  4 00:15:49 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=106c77df

Adjusted jit config options between ebuilds and eclass

 eclass/mozconfig-v5.36.eclass                | 4 +++-
 www-client/firefox/firefox-36.0.ebuild       | 4 ----
 www-client/firefox/firefox-37.0_beta1.ebuild | 4 ----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/eclass/mozconfig-v5.36.eclass b/eclass/mozconfig-v5.36.eclass
index 7959064..0cab858 100644
--- a/eclass/mozconfig-v5.36.eclass
+++ b/eclass/mozconfig-v5.36.eclass
@@ -184,7 +184,9 @@ mozconfig_config() {
 
 	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
 		mozconfig_use_enable jit ion
-		mozconfig_use_enable jit yarr-jit
+	        # Force jit simulators for mips and arm
+	        use jit && use arm && mozconfig_annotate '' --enable-arm-simulator
+	        use jit && use mips && mozconfig_annotate '' --enable-mips-simulator
 	fi
 
 	# These are enabled by default in all mozilla applications

diff --git a/www-client/firefox/firefox-36.0.ebuild b/www-client/firefox/firefox-36.0.ebuild
index a3cc92f..69c577e 100644
--- a/www-client/firefox/firefox-36.0.ebuild
+++ b/www-client/firefox/firefox-36.0.ebuild
@@ -224,10 +224,6 @@ src_configure() {
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
-	# Force jit simulators for mips and arm
-	use jit && use arm && mozconfig_annotate '' --enable-arm-simulator
-	use jit && use mips && mozconfig_annotate '' --enable-mips-simulator
-
 	# Allow for a proper pgo build
 	if use pgo; then
 		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig

diff --git a/www-client/firefox/firefox-37.0_beta1.ebuild b/www-client/firefox/firefox-37.0_beta1.ebuild
index 7acd903..813338e 100644
--- a/www-client/firefox/firefox-37.0_beta1.ebuild
+++ b/www-client/firefox/firefox-37.0_beta1.ebuild
@@ -223,10 +223,6 @@ src_configure() {
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
-	# Force jit simulators for mips and arm
-	use jit && use arm && mozconfig_annotate '' --enable-arm-simulator
-	use jit && use mips && mozconfig_annotate '' --enable-mips-simulator
-
 	# Allow for a proper pgo build
 	if use pgo; then
 		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig