Fixed -jit builds and re-added use flag to firefox-36, bug 541770

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 62 insertions, 16 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 54238028d836..068b18a8fb86 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.391 2015/03/02 20:19:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.392 2015/03/04 00:02:33 axs Exp $
+
+*firefox-36.0-r1 (04 Mar 2015)
+
+  04 Mar 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/firefox-36.0-depollute-CONST-from-dtoa.patch,
+  +files/firefox-36.0-disable-ion.patch, +firefox-36.0-r1.ebuild,
+  -firefox-36.0.ebuild:
+  Fixed -jit builds and re-added use flag to firefox-36, bug 541770
 
   02 Mar 2015; Jeroen Roovers <jer@gentoo.org> firefox-31.5.0.ebuild:
   Stable for HPPA (bug #541316).
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 5c729a13f9c1..131ae9c79769 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -5,6 +5,8 @@ AUX firefox-31.0-webm-disallow-negative-samples.patch 1154 SHA256 15d30a7e48655c
 AUX firefox-32.0-hppa-js-configure.patch 363 SHA256 405db6bef28e9ea1b879ad62b57aa82b6fd7d423937ec84d19fe96610bdaf326 SHA512 b9b92f9738bc8a26d8934ae0c9f73089e12415dc0647e5e815257afdf4f3a1eed323892f722b9b85c013ff062e4a7f6db89b51deb171731f7f073871289b0262 WHIRLPOOL 1bdc1a3e6cd7e5b2cc762c6b2555615e07cbe34b866f046786c112516c6e5e4b3b6ddd846c680ddf78e4de58c57fef96931e2ce5d26d01731d1ef3aa8ab012a7
 AUX firefox-33.0-jemalloc-configure.patch 1130 SHA256 9b06f23a96da205aac1de73f45e926bffb4c4e0bf0249a323074370a7956b012 SHA512 22ef9036a832208c2ab66e649ac82b4dcbbd28c7b68426ca34882ef13ec50a4d25b8d9e8022848af95a4ab6b4080b9b4f2229a88c7396486f2cf9fd86d6d0fc3 WHIRLPOOL 814e3199b6be04237a223da963eeb2aa04fa77f5c14a6b637be04d62b8fbb741617eda2676ffab8a54a18a2e338c20e1e20d1d0a646c21b285dc3b856955ae67
 AUX firefox-35.0-gmp-clearkey-sprintf.patch 331 SHA256 b4c206440dbe298c03a8b5c83c860a918dda6292a882c17e15656aa3b28ceade SHA512 1ad8cbf34a10b478687280f5378fd628a7cc82a2bdd8ea1917f6995fe60770415bb3dac190aeb8927ca94d98cf6d1775e3f23d175997d01c868419068a8326cf WHIRLPOOL b8f4af5a9fb8e5926173826340d84a7b648cd91cbb50b7e577fd4c3d3ac1008d03a93a46809de61ed3e8a35d7aaf34eac705d928e8800005fe0ca1fc5071250e
+AUX firefox-36.0-depollute-CONST-from-dtoa.patch 373 SHA256 0a426a0f3938e8faf573d59d03ce52dfbdf6e1f469fa175a9729293c67d32a43 SHA512 c26e9e8f6782ae56fb7c4e874788aa504856d938981c21a9fb513b0585263937e6cc80f16684ccd22796f093d467fa05d4d9676556f92678a331fa2bff804e9c WHIRLPOOL abb79b59847e2e39b643a557321174e92910941dd6d9408855924cf517fdc6f781d49b2b90a6767dcb7a1758f0ce73e95f24b2f01baf9e02b070da106af7685e
+AUX firefox-36.0-disable-ion.patch 1154 SHA256 ef8a8697815e1785cb7311dd2066fca55ea3c130f191321a3891a7dfba4b6282 SHA512 633304f37deca10b45b83948b2f38f2461945d85449386db2cad51457b045be4c29cab770e415622f921832391ccada70457d4570576f8fe415ef569ade13918 WHIRLPOOL d7f311bbb4a2cf4147d9c2ea0c5c268e77b41a99af7b9204920acbe142f44569b25073a69b893612aea1da0ea4d21f5c9507e47783fed6aca43ceb029e1880ee
 AUX gentoo-default-prefs.js-1 821 SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2 WHIRLPOOL 770d4b15f1b142ee1f59ce47f7b6d9e4bf4adb20a8a9fc104ea7d6c2481edb0d685c2e672008dbd869d92e8b24ea6ad8efdb4180421ff19ae88d0a9f6f752121
 AUX icon/firefox.desktop 276 SHA256 212f1fd0041ea481be63d46048384b781fdb1da1b8873284a8bcccd208605a0b SHA512 907e64274d96bf59bed14ca83b7307e26670e567ddf726c0ff4eb201a1641257799fa2f6b9698e671408ea1f21308a7ca499412498885608f35bc49644c71799 WHIRLPOOL 2076c00edd2890cdcb130abef6624b044973d1725da2d98bb0e9d3d72b8f32d86eddd157458fc9199d832bddddcc753a8e56572765f0d6cc410fec6f3a7b78f9
 DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 615b47ed076ead8f6fe8a9cc8b51ae7615bb8fb404a3e7254190e73c6669479f SHA512 caf76c23e3ad4ae0fd9d240d4ee61c289bfc727ae8117a17c27396d32ab9e06512cfa53da86c99e6c2d941eca96e18c41775473f3c4a16cf8c91a2e8dbe144ad WHIRLPOOL c0104c84c20a28b945ce2fe5a22e00ccd412d00bc38e4d51583fb47765bd639808db1a1bb52be9b7515423437ae131e12dd5f837b35d8e2e50dfb86341446396
@@ -429,14 +431,14 @@ EBUILD firefox-24.3.0.ebuild 12084 SHA256 28335ad221d0b32d6185535afc758808ce3dd6
 EBUILD firefox-31.3.0.ebuild 11641 SHA256 48d4190c7f02d00098ea51b284ddb8c7f88382f67b6d60466565145f868d11d0 SHA512 146892ca7859aa02d41792f89ee30f67fecb05701c85063ce6054d7c0fadd6e478792eba4858c017c509e87cc91667d9ead10a6335319b7b1dace899423250cb WHIRLPOOL ee424efc7c30369ac4fcaa2191f79055c9346045e581a23267badc0a903a29aa6c1d5ad8344322d9713eb999edd9ea2504af17b8c018f4985ef52f59e872414f
 EBUILD firefox-31.4.0.ebuild 11620 SHA256 8d3f2abfcd9be8b6a2bb9265264f886a086361b856ad766356bf667f1ba4745e SHA512 766fcb9eef71f0b838696e1eeab1c63199bd3f292941408e4ec1dddcf29feaae0576738aca7b0d5b6f031449bd07391bac0305c577beeae4f34f091ee13e0611 WHIRLPOOL 997a9f8fa2bcb9ec7231e9c56d2d1f6970fa3ce2d30372a27d2652f58bf11300853e35eaef12aae8bb7652574f165b650a378cede073225139d7482ddbb07ea6
 EBUILD firefox-31.5.0.ebuild 11624 SHA256 b8a48ace6a0c158306c2f9daac3e52e94d14909cef22a789fc9fc2201d6337a1 SHA512 c4b0830c6072cebd55f98ffd95a700ae79161a4ece6a838368c43611e6d5b3a352efd30fb27ebb9961a2d6157d5228671928a543582ea1f2b9dffccfaf18ad86 WHIRLPOOL 11fcb0b7364150842a517b06dd2400921dd007ca6ef3f02f4fcb3081a756850b25bd15f1d0c70350fa2c813c8287fe8702be5cbff0a56943009fa3cfd4717723
-EBUILD firefox-36.0.ebuild 11893 SHA256 204e6223690200d15023c1a0dd664da471d2383a96bcf656a2f673d184f188b4 SHA512 de9f80f5f21569bc4df48421b2a86a48e6dcf8a5175118183977e0eba5d9bd25af428419f707dc91b2e5d3d65d06f501b2ed73412bc4a399a4bcf443501f9d1a WHIRLPOOL 65dab988fc24f20bd1762fe0e7baa4647f5f6107e44c2578fae1f906e5a26b368d51d3b32c400cfb2673b5cdb25903f118596daf03228c563ce21f3009018e6a
-MISC ChangeLog 64488 SHA256 4b76565027bea1f868e3b87008e6d72638b68ec86e96da61f95db8b998d1797c SHA512 5ad4d81d50544820a82e93779c5202749fdb7a38a2cc9ba3e23d44dc809203122812c9da084d2fd062aa01947d7584b18c4247d7d1c5a4ea0afc11b0db744ec1 WHIRLPOOL 98c2a485b7bb04cae5d5f44224fbd31b9eff7dc1ec9fc2b6065658e9f99679c1ffe4e16e08ee0443dff2d351d5a59b3ea7b4cb4b9a7cff0fae022f00680c5a8b
+EBUILD firefox-36.0-r1.ebuild 11957 SHA256 1c52b98cce93e35e36fe92ac10f13d3f6d4039c6eabca502d9c098b8dbcaf919 SHA512 b3e89c05e72f0a129b69a839212e563fbccbcf77c2455a9c84c77c6671a993dce0ca72dd5b2c47cd2ba50e949dd8cdb720bcbdbdb5ef3f5c01aa4709245fbf2a WHIRLPOOL 145d67f7a69f20b9ba62a82ee0cdfe2bcb97cf494c818f68e6636c4cdc5ad840e0dc01c3a844b2c4126530aa9f447e6eab341e5d5087ec9f754b0654b5d09968
+MISC ChangeLog 64791 SHA256 d2b424676b41459d6886266635f12842d009b6f80cf386d65846032eae2e17ee SHA512 deb382d3161d760f2e436a212e8abb785025e20b9d1154a8cba77157aa080a5ef89a67db7fdedd13716c372c3d545521452258fc7c3fcd61ed4ce6205a53144b WHIRLPOOL 7a75f121d8e479f7282afc6356002124c65e6cfb4c9a17bf653390cf1c2236550e2fb223993416153876894b31f462baab37468a960894818004d1dd590af722
 MISC ChangeLog-2009 109736 SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8 SHA512 db43c51ba072bd47d8bdf313481156b2e6238c9905147033dc7d7ce5a634ca01b7cfdd399c7b03a4f4af8c44eabf353c7b7e22642220975f1bd33d5a109cce10 WHIRLPOOL 7bdbc95d44e2a564cada83e831ee80b849d468138a6d5e75f23fd4e165408e07af4891bc6989af8e1f792f8d963613de20d013e5a610ee58855c0aad0de475fe
 MISC metadata.xml 1332 SHA256 6472dd21d6d153e44d858e6dbc7f998278f6be6dc65b9ef3a2ef86ee2c5b8533 SHA512 10a3e92528ca24810917b4580d22ae0b979d7704e5faf40c85204dc2bd76e60c21178f13cddb33145688a674812660ebde1c7e51daf9cd170dc54ee99eb8776d WHIRLPOOL 672be0b9d4372ddebd2f4721696daacac92a91ea21d2331c741e97117875eca92d07452377babd20e09908ec80c9b6196ba805584653c202ff2a44d7233fb58d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT0xfAACgkQVWmRsqeSphPriwCfePhN4qWnITb+nC4gnHoVi7Mr
-x10AnR1PB7UmbsB3iEW7ulm56HC8R85l
-=kf6P
+iF4EAREIAAYFAlT2S6UACgkQ2ugaI38ACPB+ngD+J9CxkBmKlAQtm74/mG+JEcEy
+EqUDW83OT+OmIqR8qVUBAJG2LWnBJyVjrzy6VbBYSc1mXZkNAENG6IQNl6XMIkc3
+=U9pR
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/files/firefox-36.0-depollute-CONST-from-dtoa.patch b/www-client/firefox/files/firefox-36.0-depollute-CONST-from-dtoa.patch
new file mode 100644
index 000000000000..137bbfd17dfe
--- /dev/null
+++ b/www-client/firefox/files/firefox-36.0-depollute-CONST-from-dtoa.patch
@@ -0,0 +1,18 @@
+--- a/mozilla-release/js/src/dtoa.c	2015-03-01 12:51:12.950912536 -0500
++++ b/mozilla-release/js/src/dtoa.c	2015-03-01 12:57:49.670919777 -0500
+@@ -245,6 +245,7 @@
+ #endif
+ 
+ #ifndef CONST
++#define DTOA_UNSETCONSTDEF
+ #ifdef KR_headers
+ #define CONST /* blank */
+ #else
+@@ -3246,3 +3247,7 @@
+ 		*rve = s;
+ 	return s0;
+ 	}
++
++#ifdef DTOA_UNSETCONSTDEF
++#undef CONST
++#endif
diff --git a/www-client/firefox/files/firefox-36.0-disable-ion.patch b/www-client/firefox/files/firefox-36.0-disable-ion.patch
new file mode 100644
index 000000000000..50c5c51420e7
--- /dev/null
+++ b/www-client/firefox/files/firefox-36.0-disable-ion.patch
@@ -0,0 +1,18 @@
+--- a/mozilla-release/js/src/jit/none/Lowering-none.h	2015-03-01 11:11:55.340803791 -0500
++++ a/mozilla-release/js/src/jit/none/Lowering-none.h	2015-03-01 11:18:41.500811205 -0500
+@@ -65,6 +65,7 @@
+     bool lowerMulI(MMul *, MDefinition *, MDefinition *) { MOZ_CRASH(); }
+     bool lowerUDiv(MDiv *) { MOZ_CRASH(); }
+     bool lowerUMod(MMod *) { MOZ_CRASH(); }
++    bool visitValue(LValue *value) { MOZ_CRASH(); }
+     bool visitBox(MBox *box) { MOZ_CRASH(); }
+     bool visitUnbox(MUnbox *unbox) { MOZ_CRASH(); }
+     bool visitReturn(MReturn *ret) { MOZ_CRASH(); }
+@@ -78,6 +79,7 @@
+     bool visitAsmJSStoreHeap(MAsmJSStoreHeap *ins) { MOZ_CRASH(); }
+     bool visitAsmJSLoadFuncPtr(MAsmJSLoadFuncPtr *ins) { MOZ_CRASH(); }
+     bool visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins) { MOZ_CRASH(); }
++    bool visitSubstr(MSubstr *ins) { MOZ_CRASH(); }
+     bool visitForkJoinGetSlice(MForkJoinGetSlice *ins) { MOZ_CRASH(); }
+     bool visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop *ins) { MOZ_CRASH(); }
+     bool visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement *ins) { MOZ_CRASH(); }
diff --git a/www-client/firefox/firefox-36.0.ebuild b/www-client/firefox/firefox-36.0-r1.ebuild
index b616bb66a083..3b57881197a3 100644
--- a/www-client/firefox/firefox-36.0.ebuild
+++ b/www-client/firefox/firefox-36.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-36.0.ebuild,v 1.4 2015/03/01 01:44:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-36.0-r1.ebuild,v 1.1 2015/03/04 00:02:33 axs Exp $
 
 EAPI="5"
 VIRTUALX_REQUIRED="pgo"
@@ -34,7 +34,7 @@ MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
 
 MOZCONFIG_OPTIONAL_WIFI=1
-# No longer optional -- MOZCONFIG_OPTIONAL_JIT="enabled"
+MOZCONFIG_OPTIONAL_JIT="enabled"
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.36 multilib pax-utils fdo-mime autotools virtualx mozlinguas
 
@@ -147,6 +147,8 @@ src_prepare() {
 	epatch "${WORKDIR}/firefox"
 
 	epatch "${FILESDIR}"/${PN}-35.0-gmp-clearkey-sprintf.patch
+	epatch "${FILESDIR}"/${PN}-36.0-disable-ion.patch
+	epatch "${FILESDIR}"/${PN}-36.0-depollute-CONST-from-dtoa.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
@@ -222,11 +224,9 @@ src_configure() {
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
-	# Force jit
-	mozconfig_annotate '' --enable-ion
 	# Force jit simulators for mips and arm
-	use arm && mozconfig_annotate '' --enable-arm-simulator
-	use mips && mozconfig_annotate '' --enable-mips-simulator
+	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
@@ -354,11 +354,11 @@ src_install() {
 	fi
 
 	# Required in order to use plugins and even run firefox on hardened.
-#	if use jit; then
+	if use jit; then
 		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-#	else
-#		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-#	fi
+	else
+		pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	fi
 
 	if use minimal; then
 		rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \