summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/xulrunner/ChangeLog5
-rw-r--r--net-libs/xulrunner/xulrunner-1.9.2.8.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index a9ba20a2ae5f..75d2b8a28238 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/xulrunner
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.341 2010/07/25 16:27:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.342 2010/07/26 18:44:56 grobian Exp $
+
+ 26 Jul 2010; Fabian Groffen <grobian@gentoo.org> xulrunner-1.9.2.8.ebuild:
+ Fix compilation on Solaris
25 Jul 2010; Jory A. Pratt <anarchy@gentoo.org>
-xulrunner-1.9.0.11-r1.ebuild, -xulrunner-1.9.0.14.ebuild,
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild
index 88ca33c3589a..05b9e1afd634 100644
--- a/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild,v 1.4 2010/07/25 15:32:39 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild,v 1.5 2010/07/26 18:44:56 grobian Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -67,6 +67,10 @@ src_prepare() {
xulrunner/installer/Makefile.in \
xulrunner/app/nsRegisterGREUnix.cpp
+ # fix double symbols due to double -ljemalloc
+ sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
+ xulrunner/stub/Makefile.in || die
+
# Allow user to apply additional patches without modifing ebuild
epatch_user