summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-10-02 10:29:22 +0000
committerTravis Tilley <lv@gentoo.org>2004-10-02 10:29:22 +0000
commitb3a7782f587f3ffb6510da1d185331dc395d2a4f (patch)
treeb18d94d2b3c5fff4c1322bc7017a5592f903cf9f
parenttwo new stable ebuilds (diff)
downloadgentoo-2-b3a7782f587f3ffb6510da1d185331dc395d2a4f.tar.gz
gentoo-2-b3a7782f587f3ffb6510da1d185331dc395d2a4f.tar.bz2
gentoo-2-b3a7782f587f3ffb6510da1d185331dc395d2a4f.zip
stable on amd64 + added a fix for building with hardened gcc
-rw-r--r--net-www/mozilla-firefox/ChangeLog6
-rw-r--r--net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild9
2 files changed, 12 insertions, 3 deletions
diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 229f7ea63c21..9204eb1c3218 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/mozilla-firefox
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.69 2004/10/02 06:50:40 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.70 2004/10/02 10:29:22 lv Exp $
+
+ 02 Oct 2004; Travis Tilley <lv@gentoo.org>
+ mozilla-firefox-1.0_pre-r2.ebuild:
+ stable on amd64, added hardened gcc 'fix'
*mozilla-firefox-1.0_pre-r2 (02 Oct 2004)
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
index 1cba632f6fb5..691824ee899d 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild,v 1.3 2004/10/02 07:12:51 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild,v 1.4 2004/10/02 10:29:22 lv Exp $
inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
@@ -12,7 +12,7 @@ MY_PV=${PV/_pre/PR.1}
SRC_URI="mirror://gentoo/firefox-${MY_PV}-source.tar.bz2 \
http://dev.gentoo.org/~brad/firefox-${MY_PV}-source.tar.bz2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha amd64 ~ia64"
SLOT="0"
LICENSE="MPL-1.1 | NPL-1.1"
IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
@@ -69,6 +69,11 @@ src_compile() {
--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
--enable-single-profile"
+ # hardened GCC uses -fstack-protector-all by default, and this breaks
+ # firefox.
+ has_hardened && append-flags -fno-stack-protector-all
+ replace-flags -fstack-protector-all -fstack-protector
+
####################################
#
# Configure and build Firefox