[67372] trunk/dports/devel/mono

[jeremyhu at macports.org]

Revision: 67372
          http://trac.macports.org/changeset/67372
Author:   jeremyhu at macports.org
Date:     2010-05-06 15:11:13 -0700 (Thu, 06 May 2010)
Log Message:
-----------
mono: Update ucontext patch for Leopard.

Modified Paths:
--------------
    trunk/dports/devel/mono/Portfile

Added Paths:
-----------
    trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff

Removed Paths:
-------------
    trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff
    trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff

Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile	2010-05-06 21:47:54 UTC (rev 67371)
+++ trunk/dports/devel/mono/Portfile	2010-05-06 22:11:13 UTC (rev 67372)
@@ -92,7 +92,7 @@
     configure.cflags-append    -D_NONSTD_SOURCE
     configure.cxxflags-append    -D_NONSTD_SOURCE
     patchfiles-append patch-interp.h.diff patch-sys-mman.c.diff \
-        patch-mono-mini-mini-x86.h.diff \
+        patch-mono-utils-mono-sigcontext.h.diff \
         patch-libgc-darwin_stop_world.c.diff
 }
 

Deleted: trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff	2010-05-06 21:47:54 UTC (rev 67371)
+++ trunk/dports/devel/mono/files/patch-mono-mini-mini-ppc.h.diff	2010-05-06 22:11:13 UTC (rev 67372)
@@ -1,18 +0,0 @@
---- mono/mini/mini-ppc.h	2008-03-25 00:04:36.000000000 +0100
-+++ mono/mini/mini-ppc.h	2008-03-25 00:04:47.000000000 +0100
-@@ -178,13 +178,13 @@
- 	#define UCONTEXT_REG_FPRn(ctx, n) ((ctx)->uc_mcontext.uc_regs->fpregs.fpregs [(n)])
- 	#define UCONTEXT_REG_NIP(ctx)     ((ctx)->uc_mcontext.uc_regs->gregs [PT_NIP])
- 	#define UCONTEXT_REG_LNK(ctx)     ((ctx)->uc_mcontext.uc_regs->gregs [PT_LNK])
--#elif defined (__APPLE__) && defined (_STRUCT_MCONTEXT)
-+#elif defined (__APPLE__) && __DARWIN_UNIX03
- 	typedef struct __darwin_ucontext os_ucontext;
- 
- 	#define UCONTEXT_REG_Rn(ctx, n)   ((ctx)->uc_mcontext->__ss.__r##n)
- 	#define UCONTEXT_REG_FPRn(ctx, n) ((ctx)->uc_mcontext->__fs.__fpregs [(n)])
- 	#define UCONTEXT_REG_NIP(ctx)     ((ctx)->uc_mcontext->__ss.__srr0)
--#elif defined (__APPLE__) && !defined (_STRUCT_MCONTEXT)
-+#elif defined (__APPLE__) && !__DARWIN_UNIX03
- 	typedef struct ucontext os_ucontext;
- 
- 	#define UCONTEXT_REG_Rn(ctx, n)   ((ctx)->uc_mcontext->ss.r##n)

Deleted: trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff	2010-05-06 21:47:54 UTC (rev 67371)
+++ trunk/dports/devel/mono/files/patch-mono-mini-mini-x86.h.diff	2010-05-06 22:11:13 UTC (rev 67372)
@@ -1,20 +0,0 @@
---- mono/mini/mini-x86.h	2008-03-25 00:04:41.000000000 +0100
-+++ mono/mini/mini-x86.h	2008-03-25 00:04:47.000000000 +0100
-@@ -152,7 +152,7 @@
- 	#define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.mc_esi)
- 	#define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.mc_edi)
- 	#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.mc_eip)
--#elif defined(__APPLE__) && defined(_STRUCT_MCONTEXT)
-+#elif defined(__APPLE__) && __DARWIN_UNIX03
- 	#define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext->__ss.__eax)
- 	#define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext->__ss.__ebx)
- 	#define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext->__ss.__ecx)
-@@ -162,7 +162,7 @@
- 	#define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext->__ss.__esi)
- 	#define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext->__ss.__edi)
- 	#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext->__ss.__eip)
--#elif defined(__APPLE__) && !defined(_STRUCT_MCONTEXT)
-+#elif defined(__APPLE__) && !__DARWIN_UNIX03
- 	#define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext->ss.eax)
- 	#define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext->ss.ebx)
- 	#define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext->ss.ecx)

Added: trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff	                        (rev 0)
+++ trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff	2010-05-06 22:11:13 UTC (rev 67372)
@@ -0,0 +1,21 @@
+--- mono/utils/mono-sigcontext.h.orig	2010-05-06 15:03:45.000000000 -0700
++++ mono/utils/mono-sigcontext.h	2010-05-06 15:06:37.000000000 -0700
+@@ -8,9 +8,6 @@
+ #if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <ucontext.h>
+ #endif
+-#if defined(__APPLE__)
+-#include <AvailabilityMacros.h>
+-#endif
+ 
+ #if defined(__FreeBSD__)
+ 	#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eax)
+@@ -23,7 +20,7 @@
+ 	#define UCONTEXT_REG_EDI(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_edi)
+ 	#define UCONTEXT_REG_EIP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eip)
+ #elif defined(__APPLE__)
+-#  if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
++#  if __DARWIN_UNIX03
+ 	#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__eax)
+ 	#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__ebx)
+ 	#define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__ecx)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100506/23b6910e/attachment-0001.html>