summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-07-26 18:44:56 +0000
committerFabian Groffen <grobian@gentoo.org>2010-07-26 18:44:56 +0000
commitc47b0a349fd134f04305784e63c9323f21cdf20a (patch)
tree2f22cc7692110fa848b963a6eb23c2d6b6897f51 /net-libs/xulrunner
parentMarked ~ppc-macos (diff)
downloadhistorical-c47b0a349fd134f04305784e63c9323f21cdf20a.tar.gz
historical-c47b0a349fd134f04305784e63c9323f21cdf20a.tar.bz2
historical-c47b0a349fd134f04305784e63c9323f21cdf20a.zip
Fix compilation on Solaris, acked by Anarchy in IRC
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-libs/xulrunner')
-rw-r--r--net-libs/xulrunner/ChangeLog5
-rw-r--r--net-libs/xulrunner/Manifest4
-rw-r--r--net-libs/xulrunner/xulrunner-1.9.2.8.ebuild6
3 files changed, 11 insertions, 4 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/Manifest b/net-libs/xulrunner/Manifest
index 4499685b61e0..ab5092c30797 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -18,6 +18,6 @@ DIST firefox-3.6.8.source.tar.bz2 51238976 RMD160 14e245c643d41a1da25fe4dbc15d6a
DIST xulrunner-1.9.2-patches-0.4.tar.bz2 5742 RMD160 d67504884a5959704d8cb2cfa7ff42401f328ac1 SHA1 3e1ba98046b9a4408e3eceb919ee9439ef328bdc SHA256 89db8d1cb166e97d56f911ebdfb8de852ab4335f137a4b7163345e8273a63d3f
DIST xulrunner-1.9.2-patches-0.5.tar.bz2 13198 RMD160 fcd87acc7b3b7c353d6fd6bdded897b9e30b4e9e SHA1 1def3a142097bfd4e97b677791115a79b1ebd3be SHA256 e22db75ec69c2996b1c247e412a2430f2a658ed6b72733fd5829bb33d16828cc
EBUILD xulrunner-1.9.2.4.ebuild 7191 RMD160 8633d7a9e174309d378bed99dcce757350a5e031 SHA1 f1da98486f1c78d5cb01da2e5b7174618e9694ea SHA256 9105361d24aec4de8f012180008d848b9672be2dc17fb8bc0762831381558149
-EBUILD xulrunner-1.9.2.8.ebuild 7517 RMD160 b6466093f64faa5952048cdb1735c71556dcfc11 SHA1 72e6e116e376dd32227fc3139528cfbdedca0ac4 SHA256 718b1b3f427e5e18bbd2ff47312e4394bf994e9f39e49f82249d3ee996d25110
-MISC ChangeLog 46811 RMD160 89fa3d1d1d8c6e7d32a8f657ed45826eff06db9b SHA1 80bb2d7abd8b77fcb5019ada0ae600a18d9060b5 SHA256 f2a2cc93c7843aabe2da693a33488ce300497be211f9b25ffdd06107f47ba277
+EBUILD xulrunner-1.9.2.8.ebuild 7650 RMD160 2e016ff239d3ba2046c1b5fd7a93fdfe1c081906 SHA1 e2c9fbd5623e49d57de8d8ea041acbf10d791d1b SHA256 444158cfe0a714b7d27a60f691dae033e1b6ab0987be8f3be521bec7828d1027
+MISC ChangeLog 46918 RMD160 fcaeda943b80239fe7793f1cad13998f4b54473f SHA1 cfad775211000a6e085c6d750eed77e6b466f902 SHA256 7d6d093ecdf80f6e3e74f4b918d0cfd1e6e032c1dba0072caf300be3c246e9f7
MISC metadata.xml 534 RMD160 6f9915565c51559c0e4726fed4e43cffce894306 SHA1 7ababd8846ab59b3ea43ac0153750584aa792055 SHA256 60f561d9e9846e96bfa0d6a9161058986c65dba93879073e7138477b6ce61978
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