summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2004-07-10 06:05:17 +0000
committerPeter Johanson <latexer@gentoo.org>2004-07-10 06:05:17 +0000
commitda065f6a910f5ea84b332b8563efc2d6cc0b1702 (patch)
tree33105d652cde40af8e2d09903ddb30b93275c411 /dev-dotnet
parentstabilize since this package provides virtual/linux-sources for ia64 (diff)
downloadhistorical-da065f6a910f5ea84b332b8563efc2d6cc0b1702.tar.gz
historical-da065f6a910f5ea84b332b8563efc2d6cc0b1702.tar.bz2
historical-da065f6a910f5ea84b332b8563efc2d6cc0b1702.zip
amd64 fix. See bug #55722
Diffstat (limited to 'dev-dotnet')
-rw-r--r--dev-dotnet/mono/ChangeLog6
-rw-r--r--dev-dotnet/mono/Manifest5
-rw-r--r--dev-dotnet/mono/files/mono-1.0-segv.diff11
-rw-r--r--dev-dotnet/mono/mono-1.0.ebuild12
4 files changed, 29 insertions, 5 deletions
diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index 2d08cc049b2f..c8c5c32ccb0d 100644
--- a/dev-dotnet/mono/ChangeLog
+++ b/dev-dotnet/mono/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-dotnet/mono
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.25 2004/06/30 15:34:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.26 2004/07/10 06:05:17 latexer Exp $
+
+ 10 Jul 2004; Peter Johanson <latexer@gentoo.org> +files/mono-1.0-segv.diff,
+ mono-1.0.ebuild:
+ Fix for amd64. See bug #55722
*mono-1.0 (30 Jun 2004)
diff --git a/dev-dotnet/mono/Manifest b/dev-dotnet/mono/Manifest
index 2bd0b0d57180..b26f9fbb576c 100644
--- a/dev-dotnet/mono/Manifest
+++ b/dev-dotnet/mono/Manifest
@@ -6,8 +6,8 @@ MD5 d61de115e7b37b55c71b44b0cb2bee89 mono-0.28.ebuild 2093
MD5 38b11c580052bca1c3ab11d14b281b51 mono-0.95.ebuild 1557
MD5 198b7500d7079c1159c29aba0b3e3250 mono-0.97.ebuild 1784
MD5 f694ec86655b731f2d46488f531684f5 mono-0.31.ebuild 2546
-MD5 05ee3c2bd032791e7e488c59faa4ff63 ChangeLog 8043
-MD5 9e0064b968c1412f58dd40d63f9459f4 mono-1.0.ebuild 1557
+MD5 72cb090deb467c0a0dbcbba5da1d456a ChangeLog 8173
+MD5 17c5779bfef6d1e1415ec71550d175ea mono-1.0.ebuild 1656
MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
MD5 9f4b4eb6a1555ed574dbdd359cae3070 files/dotnet.conf 573
MD5 f33c78b627cbbc1db2ab5f6cc5299e70 files/dotnet.init 1034
@@ -20,3 +20,4 @@ MD5 274bce1afaca6fcf8751ccea8d3d77c7 files/digest-mono-0.95 63
MD5 7aace03d500c5c79171c98bfd0ed7b7e files/digest-mono-0.96 63
MD5 d84a98b3dd678d6332f84ca5c148191c files/digest-mono-0.97 63
MD5 3962d8b955a13bd0ea349669343c018e files/digest-mono-1.0 62
+MD5 3c800bd50d6527c12be393369c234f0e files/mono-1.0-segv.diff 378
diff --git a/dev-dotnet/mono/files/mono-1.0-segv.diff b/dev-dotnet/mono/files/mono-1.0-segv.diff
new file mode 100644
index 000000000000..858a75f60cbf
--- /dev/null
+++ b/dev-dotnet/mono/files/mono-1.0-segv.diff
@@ -0,0 +1,11 @@
+--- mono-0.97/mono/interpreter/interp.c.orig 2004-06-26 17:55:52.739575943 +0200
++++ mono-0.97/mono/interpreter/interp.c 2004-06-26 17:54:44.489967101 +0200
+@@ -1164,7 +1164,7 @@
+ }
+ }
+
+- if (method->klass->valuetype)
++ if (method->klass->valuetype && obj)
+ /* Unbox the instance, since valuetype methods expect an interior pointer. */
+ obj = mono_object_unbox (obj);
+
diff --git a/dev-dotnet/mono/mono-1.0.ebuild b/dev-dotnet/mono/mono-1.0.ebuild
index 4bf099db444b..f7eeddbc7d57 100644
--- a/dev-dotnet/mono/mono-1.0.ebuild
+++ b/dev-dotnet/mono/mono-1.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.ebuild,v 1.1 2004/06/30 15:34:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.ebuild,v 1.2 2004/07/10 06:05:17 latexer Exp $
-inherit eutils mono flag-o-matic
+inherit eutils mono flag-o-matic debug
DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
HOMEPAGE="http://www.go-mono.com/"
@@ -23,6 +23,14 @@ RDEPEND="${DEPEND}
dev-util/pkgconfig
dev-libs/libxml2"
+src_unpack() {
+ unpack ${A}
+
+ cd ${S}
+ # Fix for amd64
+ epatch ${FILESDIR}/${P}-segv.diff
+}
+
src_compile() {
strip-flags