From 13e19325957f02ed4eba15fdec7f42239da19252 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 17 Sep 2014 14:02:03 +0200 Subject: installation fix - i686 --- firefox-baseline-disable.patch | 13 +++++++++++++ firefox.spec | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 firefox-baseline-disable.patch diff --git a/firefox-baseline-disable.patch b/firefox-baseline-disable.patch new file mode 100644 index 0000000..806d378 --- /dev/null +++ b/firefox-baseline-disable.patch @@ -0,0 +1,13 @@ +diff -up firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile.old firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile +diff -up firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js +--- firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old 2014-09-12 00:25:45.000000000 +0200 ++++ firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js 2014-09-16 14:27:52.447743192 +0200 +@@ -844,7 +844,7 @@ pref("javascript.options.strict", + #ifdef DEBUG + pref("javascript.options.strict.debug", true); + #endif +-pref("javascript.options.baselinejit", true); ++pref("javascript.options.baselinejit", false); + pref("javascript.options.ion", true); + pref("javascript.options.asmjs", true); + pref("javascript.options.native_regexp", true); diff --git a/firefox.spec b/firefox.spec index 000d498..d787299 100644 --- a/firefox.spec +++ b/firefox.spec @@ -119,6 +119,7 @@ Patch20: xulrunner-32.0-backport-js-src-configure-in.patch Patch204: rhbz-966424.patch Patch215: firefox-enable-addons.patch Patch216: firefox-duckduckgo.patch +Patch217: firefox-baseline-disable.patch # Upstream patches Patch300: mozilla-858919.patch @@ -234,6 +235,10 @@ cd %{tarballdir} %patch204 -p1 -b .966424 %patch215 -p1 -b .addons %patch216 -p1 -b .duckduckgo +# disable baseline JIT on i686 (rhbz#1047079) +%ifarch %{ix86} +%patch217 -p2 -b .baseline +%endif # Upstream patches %patch300 -p1 -b .858919 @@ -334,11 +339,6 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig echo "ac_add_options --disable-crashreporter" >> .mozconfig %endif -# disable baseline JIT on i686 (rhbz#1047079) -%ifarch %{ix86} -echo 'pref("javascript.options.baselinejit", false);' >> %{SOURCE12} -%endif - #--------------------------------------------------------------------- %build -- cgit