summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2012-12-10 20:19:42 +0000
committerIan Stakenvicius <axs@gentoo.org>2012-12-10 20:19:42 +0000
commit8589015ae2934feda1660c41b7ec34a3d5e502f9 (patch)
tree93a27cad502af1dd6736c52571cf62de5c7a1cad /www-client/firefox
parentFix running tests in out-of-source build. (diff)
downloadgentoo-2-8589015ae2934feda1660c41b7ec34a3d5e502f9.tar.gz
gentoo-2-8589015ae2934feda1660c41b7ec34a3d5e502f9.tar.bz2
gentoo-2-8589015ae2934feda1660c41b7ec34a3d5e502f9.zip
restored jit flag as is required for the embedded js, esp on hardened
(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'www-client/firefox')
-rw-r--r--www-client/firefox/ChangeLog5
-rw-r--r--www-client/firefox/firefox-17.0.1.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 24d4db70e771..c0026b3f1c90 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/firefox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.195 2012/12/10 18:55:05 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.196 2012/12/10 20:19:42 axs Exp $
+
+ 10 Dec 2012; Ian Stakenvicius <axs@gentoo.org> firefox-17.0.1.ebuild:
+ restored jit flag as is required for the embedded js, esp on hardened
10 Dec 2012; Ian Stakenvicius <axs@gentoo.org> firefox-17.0.1.ebuild:
fixed alsa and webm dependencies for bug 444874 and part of bug 444780
diff --git a/www-client/firefox/firefox-17.0.1.ebuild b/www-client/firefox/firefox-17.0.1.ebuild
index af1f60d9ca63..4c1a25961d6d 100644
--- a/www-client/firefox/firefox-17.0.1.ebuild
+++ b/www-client/firefox/firefox-17.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.1.ebuild,v 1.3 2012/12/10 18:55:05 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.1.ebuild,v 1.4 2012/12/10 20:19:42 axs Exp $
EAPI="3"
VIRTUALX_REQUIRED="pgo"
@@ -38,7 +38,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gstreamer +minimal pgo selinux system-sqlite"
+IUSE="bindist gstreamer +jit +minimal pgo selinux system-sqlite"
# More URIs appended below...
SRC_URI="${SRC_URI}
@@ -221,6 +221,9 @@ src_configure() {
mozconfig_use_enable gstreamer
mozconfig_use_enable system-sqlite
+ # Both methodjit and tracejit conflict with PaX
+ mozconfig_use_enable jit methodjit
+ mozconfig_use_enable jit tracejit
# Allow for a proper pgo build
if use pgo; then