From 2a260ad825a3975a939f7b98d5959d3a6e85ebb0 Mon Sep 17 00:00:00 2001
From: Peter Johanson <latexer@gentoo.org>
Date: Sat, 10 Jul 2004 06:05:17 +0000
Subject: amd64 fix. See bug #55722

---
 dev-dotnet/mono/ChangeLog                |  6 +++++-
 dev-dotnet/mono/files/mono-1.0-segv.diff | 11 +++++++++++
 dev-dotnet/mono/mono-1.0.ebuild          | 12 ++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 dev-dotnet/mono/files/mono-1.0-segv.diff

(limited to 'dev-dotnet/mono')

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/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
 
-- 
cgit v1.2.3-65-gdbad