summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2005-06-03 14:52:07 +0000
committerPeter Johanson <latexer@gentoo.org>2005-06-03 14:52:07 +0000
commit7bbbcb282d61ef0e338b624f8c78a80520e7a670 (patch)
tree29c966ada0a98370f7c3ee25588dd7dcd4729f43 /dev-lang/mono
parentAdd blockers on koffice. (diff)
downloadgentoo-2-7bbbcb282d61ef0e338b624f8c78a80520e7a670.tar.gz
gentoo-2-7bbbcb282d61ef0e338b624f8c78a80520e7a670.tar.bz2
gentoo-2-7bbbcb282d61ef0e338b624f8c78a80520e7a670.zip
Add patch to fix PPC issues. See bug #93765.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-lang/mono')
-rw-r--r--dev-lang/mono/ChangeLog6
-rw-r--r--dev-lang/mono/files/mono-1.1.7-ppc-tls.diff13
-rw-r--r--dev-lang/mono/mono-1.1.7-r1.ebuild7
3 files changed, 23 insertions, 3 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index bc5ec44ef1e0..16e93eee51d4 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/mono
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.49 2005/05/26 22:55:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.50 2005/06/03 14:52:07 latexer Exp $
+
+ 03 Jun 2005; Peter Johanson <latexer@gentoo.org>
+ +files/mono-1.1.7-ppc-tls.diff, mono-1.1.7-r1.ebuild:
+ Add patch to fix PPC issues. See bug #93765.
*mono-1.1.7-r1 (26 May 2005)
diff --git a/dev-lang/mono/files/mono-1.1.7-ppc-tls.diff b/dev-lang/mono/files/mono-1.1.7-ppc-tls.diff
new file mode 100644
index 000000000000..fe3c7ed1f8b9
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.7-ppc-tls.diff
@@ -0,0 +1,13 @@
+Index: mono/utils/mono-compiler.h
+===================================================================
+--- mono/utils/mono-compiler.h (revision 45339)
++++ mono/utils/mono-compiler.h (working copy)
+@@ -11,6 +11,8 @@
+
+ #if defined(PIC) && defined(__x86_64__)
+ #define MONO_TLS_FAST
++#elif defined (__powerpc__)
++#define MONO_TLS_FAST
+ #else
+ #define MONO_TLS_FAST __attribute__((tls_model("local-exec")))
+ #endif
diff --git a/dev-lang/mono/mono-1.1.7-r1.ebuild b/dev-lang/mono/mono-1.1.7-r1.ebuild
index 967da76b4f17..428a1a683cde 100644
--- a/dev-lang/mono/mono-1.1.7-r1.ebuild
+++ b/dev-lang/mono/mono-1.1.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.7-r1.ebuild,v 1.1 2005/05/26 22:55:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.7-r1.ebuild,v 1.2 2005/06/03 14:52:07 latexer Exp $
inherit eutils mono flag-o-matic
@@ -10,7 +10,7 @@ SRC_URI="http://www.go-mono.com/sources/mono-${PV:0:3}/${P}.tar.gz"
LICENSE="|| ( GPL-2 LGPL-2 X11)"
SLOT="0"
-KEYWORDS="~x86 -ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
IUSE="nptl icu X"
DEPEND="virtual/libc
@@ -39,6 +39,9 @@ src_unpack() {
# Fix for linking to ICU
epatch ${FILESDIR}/${PN}-1.1.5-icu-linking.diff || die
+ # Fix building on PPC
+ epatch ${FILESDIR}/${P}-ppc-tls.diff || die
+
# Fix MONO_CFG_DIR for signing
sed -i \
"s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \