dev-util/mono-debugger: added patch that allows building against kernel >=2.6.19

(Portage version: 2.1.2.7)

3 files changed, 81 insertions, 2 deletions

diff --git a/dev-util/mono-debugger/ChangeLog b/dev-util/mono-debugger/ChangeLog
index 519260464c2d..411d2b03b4c4 100644
--- a/dev-util/mono-debugger/ChangeLog
+++ b/dev-util/mono-debugger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/mono-debugger
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.11 2007/06/23 02:17:35 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.12 2007/06/27 09:28:55 jurek Exp $
+
+  27 Jun 2007; Jurek Bartuszek <jurek@gentoo.org>
+  +files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch,
+  mono-debugger-0.50.ebuild:
+  Added patch that allows building against kernel >=2.6.19. Credit goes to
+  Bernie Hackett <bernie.hackett@gmail.com> for providing the patch.
 
 *mono-debugger-0.50 (23 Jun 2007)
 
diff --git a/dev-util/mono-debugger/files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch b/dev-util/mono-debugger/files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch
new file mode 100644
index 000000000000..744dec04a86d
--- /dev/null
+++ b/dev-util/mono-debugger/files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch
@@ -0,0 +1,66 @@
+--- backend/server/i386-arch.h.orig	2007-06-26 09:14:11.000000000 -0400
++++ backend/server/i386-arch.h	2007-06-26 23:07:08.000000000 -0400
+@@ -2,12 +2,63 @@
+ #define __MONO_DEBUGGER_I386_ARCH_H__
+ 
+ #include <glib.h>
++#include <linux/version.h>
+ 
+ G_BEGIN_DECLS
+ 
+ #if defined(__i386__)
+ 
++/* 
++ * added because gentoo linux headers
++ * no longer include asm-i386/user.h
++ */
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
++
++    struct user_i387_struct {
++        long    cwd;
++        long    swd;
++        long    twd;
++        long    fip;
++        long    fcs;
++        long    foo;
++        long    fos;
++        long    st_space[20];
++    };
++
++    struct user_regs_struct {
++        long ebx, ecx, edx, esi, edi, ebp, eax;
++        unsigned short ds, __ds, es, __es;
++        unsigned short fs, __fs, gs, __gs;
++        long orig_eax, eip;
++        unsigned short cs, __cs;
++        long eflags, esp;
++        unsigned short ss, __ss;
++    };
++
++    struct user{
++	struct user_regs_struct regs;
++	int u_fpvalid;
++	struct user_i387_struct i387;
++	unsigned long int u_tsize;
++	unsigned long int u_dsize;
++	unsigned long int u_ssize;
++	unsigned long start_code;
++	unsigned long start_stack;
++	long int signal;
++	int reserved;
++	struct user_pt_regs * u_ar0;
++	struct user_i387_struct* u_fpstate;
++	unsigned long magic;
++	char u_comm[32];
++	int u_debugreg[8];
++    };
++
++#else
+ #include <asm/user.h>
++#endif
++
++/* end added structs */
+ 
+ #define INFERIOR_REGS_TYPE	struct user_regs_struct
+ #define INFERIOR_FPREGS_TYPE	struct user_i387_struct
diff --git a/dev-util/mono-debugger/mono-debugger-0.50.ebuild b/dev-util/mono-debugger/mono-debugger-0.50.ebuild
index b3867f79f4a5..f6992a79dd90 100644
--- a/dev-util/mono-debugger/mono-debugger-0.50.ebuild
+++ b/dev-util/mono-debugger/mono-debugger-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-0.50.ebuild,v 1.1 2007/06/23 02:17:35 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-0.50.ebuild,v 1.2 2007/06/27 09:28:55 jurek Exp $
 
 inherit eutils mono
 
@@ -19,6 +19,13 @@ DEPEND=">=dev-lang/mono-1.2.4
 
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-kernel-2.6.19-fix-i386-asm.patch || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"