[67373] trunk/dports/devel/mono

[jeremyhu at macports.org]

Revision: 67373
          http://trac.macports.org/changeset/67373
Author:   jeremyhu at macports.org
Date:     2010-05-06 15:18:14 -0700 (Thu, 06 May 2010)
Log Message:
-----------
mono: Properly check for __DARWIN_UNIX03 everywhere, not just Leopard.  This should also fix a build failure on Tiger.

Modified Paths:
--------------
    trunk/dports/devel/mono/Portfile
    trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff

Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile	2010-05-06 22:11:13 UTC (rev 67372)
+++ trunk/dports/devel/mono/Portfile	2010-05-06 22:18:14 UTC (rev 67373)
@@ -44,7 +44,9 @@
                  lib/libX11.dylib
 
 patchfiles       patch-configure.diff \
-                 patch-data-config.in.diff
+                 patch-data-config.in.diff \
+                 patch-mono-utils-mono-sigcontext.h.diff \
+                 patch-libgc-darwin_stop_world.c.diff
 
 # Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++)
 configure.cc-append	"-I${worksrcpath}/libgc/include"
@@ -91,9 +93,7 @@
     # is this still valid for 2.6.3+ ?
     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-utils-mono-sigcontext.h.diff \
-        patch-libgc-darwin_stop_world.c.diff
+    patchfiles-append patch-interp.h.diff patch-sys-mman.c.diff
 }
 
 livecheck.type  regex

Modified: trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff	2010-05-06 22:11:13 UTC (rev 67372)
+++ trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff	2010-05-06 22:18:14 UTC (rev 67373)
@@ -1,15 +1,23 @@
---- libgc/darwin_stop_world.c	2008-03-25 00:10:37.000000000 +0100
-+++ libgc/darwin_stop_world.c	2008-03-25 00:11:05.000000000 +0100
-@@ -105,7 +105,7 @@
+--- libgc/darwin_stop_world.c.orig	2009-09-25 07:58:09.000000000 -0700
++++ libgc/darwin_stop_world.c	2010-05-06 15:13:15.000000000 -0700
+@@ -2,7 +2,6 @@
+ 
+ # if defined(GC_DARWIN_THREADS)
+ 
+-#include <AvailabilityMacros.h>
+ #include "mono/utils/mono-compiler.h"
+ 
+ #ifdef MONO_DEBUGGER_SUPPORTED
+@@ -112,7 +111,7 @@ void GC_push_all_stacks() {
  	if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
  	
  #if defined(I386)
--#if defined(_STRUCT_X86_EXCEPTION_STATE32)
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 +#if __DARWIN_UNIX03
+ 
  	lo = state.__esp;
  
- 	GC_push_one(state.__eax); 
-@@ -127,7 +127,7 @@
+@@ -135,7 +134,7 @@ void GC_push_all_stacks() {
  	GC_push_one(state.ebp); 
  #endif
  #elif defined(POWERPC)
@@ -18,7 +26,7 @@
  	lo = (void*)(state.__r1 - PPC_RED_ZONE_SIZE);
          
  	GC_push_one(state.__r0); 
-@@ -270,7 +270,7 @@
+@@ -278,7 +277,7 @@ void GC_push_all_stacks() {
  			     (natural_t *)&info, &outCount);
  	if(r != KERN_SUCCESS) continue;
  
@@ -27,11 +35,11 @@
  	lo = (void*)(info.__r1 - PPC_RED_ZONE_SIZE);
  	hi = (ptr_t)FindTopOfStack(info.__r1);
  
-@@ -350,7 +350,7 @@
+@@ -358,7 +357,7 @@ void GC_push_all_stacks() {
  			     (natural_t *)&info, &outCount);
  	if(r != KERN_SUCCESS) continue;
  
--#if defined(_STRUCT_X86_EXCEPTION_STATE32)
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 +#if __DARWIN_UNIX03
  	lo = (void*)info.__esp;
  	hi = (ptr_t)FindTopOfStack(info.__esp);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100506/14c1b7e9/attachment.html>