[113183] trunk/dports/devel/mono
jeremyhu at macports.org
jeremyhu at macports.org
Mon Nov 11 10:55:10 PST 2013
Revision: 113183
https://trac.macports.org/changeset/113183
Author: jeremyhu at macports.org
Date: 2013-11-11 10:55:10 -0800 (Mon, 11 Nov 2013)
Log Message:
-----------
mono: Snow Leopard build fix and dead code removal
Modified Paths:
--------------
trunk/dports/devel/mono/Portfile
Added Paths:
-----------
trunk/dports/devel/mono/files/snowleopard-mutex.patch
Removed Paths:
-------------
trunk/dports/devel/mono/files/patch-configure.diff
trunk/dports/devel/mono/files/patch-data-config.in.diff
trunk/dports/devel/mono/files/patch-interp.h.diff
trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff
trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff
Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile 2013-11-11 18:42:52 UTC (rev 113182)
+++ trunk/dports/devel/mono/Portfile 2013-11-11 18:55:10 UTC (rev 113183)
@@ -40,14 +40,10 @@
test.run yes
test.target check
-post-patch {
- reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure
- reinplace s|@PREFIX@|$prefix|g $worksrcpath/data/config.in
+patchfiles snowleopard-mutex.patch
+post-patch {
if {${os.major} < 9} {
- # Should this always be done?
- reinplace "s/-mmacosx-version-min=10.5//" ${worksrcpath}/configure
-
reinplace "s:MAC_OS_X_VERSION_10_5:1050:g" \
${worksrcpath}/libgc/darwin_stop_world.c \
${worksrcpath}/mono/mini/mini-darwin.c \
@@ -84,11 +80,6 @@
${destroot}${libgc_docdir}/html
}
-platform darwin 9 {
- # is this still needed?
- patchfiles-append patch-interp.h.diff
-}
-
# beta_version is actually the latest stable
# stable_version is the EOL previous stable version
# go figure...
Deleted: trunk/dports/devel/mono/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-configure.diff 2013-11-11 18:42:52 UTC (rev 113182)
+++ trunk/dports/devel/mono/files/patch-configure.diff 2013-11-11 18:55:10 UTC (rev 113183)
@@ -1,12 +0,0 @@
---- configure.orig 2010-04-22 10:53:03.000000000 -0500
-+++ configure 2010-05-15 03:47:58.000000000 -0500
-@@ -18253,9 +18253,7 @@
- main ()
- {
-
-- void main () {
- #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
-- }
- #else
- #error No good zlib found
- #endif
Deleted: trunk/dports/devel/mono/files/patch-data-config.in.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-data-config.in.diff 2013-11-11 18:42:52 UTC (rev 113182)
+++ trunk/dports/devel/mono/files/patch-data-config.in.diff 2013-11-11 18:55:10 UTC (rev 113183)
@@ -1,34 +0,0 @@
---- data/config.in.orig 2008-11-04 15:54:12.000000000 +0100
-+++ data/config.in 2008-11-04 15:56:30.000000000 +0100
-@@ -1,23 +1,23 @@
- <configuration>
- <dllmap dll="i:cygwin1.dll" target="@LIBC@" os="!windows" />
- <dllmap dll="libc" target="@LIBC@" os="!windows"/>
-- <dllmap dll="intl" target="@INTL@" os="!windows"/>
-+ <dllmap dll="intl" target="@PREFIX@/lib/@INTL@" os="!windows"/>
- <dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
- <dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
-- <dllmap dll="libintl" target="@INTL@" os="!windows"/>
-- <dllmap dll="i:libxslt.dll" target="libxslt at libsuffix@" os="!windows"/>
-+ <dllmap dll="libintl" target="@PREFIX@/lib/@INTL@" os="!windows"/>
-+ <dllmap dll="i:libxslt.dll" target="@PREFIX@/lib/libxslt at libsuffix@" os="!windows"/>
- <dllmap dll="i:odbc32.dll" target="libodbc at libsuffix@" os="!windows"/>
- <dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
- <dllmap dll="oci" target="libclntsh at libsuffix@" os="!windows"/>
- <dllmap dll="db2cli" target="libdb2_36 at libsuffix@" os="!windows"/>
-- <dllmap dll="MonoPosixHelper" target="libMonoPosixHelper at libsuffix@" os="!windows" />
-+ <dllmap dll="MonoPosixHelper" target="@PREFIX@/lib/libMonoPosixHelper at libsuffix@" os="!windows" />
- <dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
- <dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
-- <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
-- <dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
-+ <dllmap dll="sqlite" target="@PREFIX@/lib/@SQLITE@" os="!windows"/>
-+ <dllmap dll="sqlite3" target="@PREFIX@/lib/@SQLITE3@" os="!windows"/>
- <dllmap dll="libX11" target="@X11@" os="!windows" />
-- <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
-- <dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
-+ <dllmap dll="libcairo-2.dll" target="@PREFIX@/lib/libcairo at libsuffix@" os="!windows"/>
-+ <dllmap dll="libcups" target="libcups at libsuffix@" os="!windows"/>
- <dllmap dll="i:kernel32.dll">
- <dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
- <dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/>
Deleted: trunk/dports/devel/mono/files/patch-interp.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-interp.h.diff 2013-11-11 18:42:52 UTC (rev 113182)
+++ trunk/dports/devel/mono/files/patch-interp.h.diff 2013-11-11 18:55:10 UTC (rev 113183)
@@ -1,13 +0,0 @@
---- mono/interpreter/interp.h.orig 2011-11-15 11:22:44.000000000 -0600
-+++ mono/interpreter/interp.h 2012-04-30 13:09:17.000000000 -0500
-@@ -120,8 +120,8 @@
- void
- mono_interp_transform_init (void);
-
--void inline stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvoke);
--void inline stackval_to_data (MonoType *type, stackval *val, char *data, gboolean pinvoke);
-+void stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvoke);
-+void stackval_to_data (MonoType *type, stackval *val, char *data, gboolean pinvoke);
- void ves_exec_method (MonoInvocation *frame);
-
- /*
Deleted: trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff 2013-11-11 18:42:52 UTC (rev 113182)
+++ trunk/dports/devel/mono/files/patch-libgc-darwin_stop_world.c.diff 2013-11-11 18:55:10 UTC (rev 113183)
@@ -1,46 +0,0 @@
---- 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 MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-+#if __DARWIN_UNIX03
-
- lo = state.__esp;
-
-@@ -135,7 +134,7 @@ void GC_push_all_stacks() {
- GC_push_one(state.ebp);
- #endif
- #elif defined(POWERPC)
--#if defined(_STRUCT_PPC_EXCEPTION_STATE)
-+#if __DARWIN_UNIX03
- lo = (void*)(state.__r1 - PPC_RED_ZONE_SIZE);
-
- GC_push_one(state.__r0);
-@@ -278,7 +277,7 @@ void GC_push_all_stacks() {
- (natural_t *)&info, &outCount);
- if(r != KERN_SUCCESS) continue;
-
--#if defined(_STRUCT_PPC_EXCEPTION_STATE)
-+#if __DARWIN_UNIX03
- lo = (void*)(info.__r1 - PPC_RED_ZONE_SIZE);
- hi = (ptr_t)FindTopOfStack(info.__r1);
-
-@@ -358,7 +357,7 @@ void GC_push_all_stacks() {
- (natural_t *)&info, &outCount);
- if(r != KERN_SUCCESS) continue;
-
--#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);
-
Deleted: trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff
===================================================================
--- trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff 2013-11-11 18:42:52 UTC (rev 113182)
+++ trunk/dports/devel/mono/files/patch-mono-utils-mono-sigcontext.h.diff 2013-11-11 18:55:10 UTC (rev 113183)
@@ -1,46 +0,0 @@
---- mono/utils/mono-sigcontext.h.orig 2010-04-22 10:37:45.000000000 -0500
-+++ mono/utils/mono-sigcontext.h 2010-05-15 03:42:48.000000000 -0500
-@@ -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)
-@@ -104,20 +101,22 @@
- #define UCONTEXT_REG_NIP(ctx) (((os_ucontext*)(ctx))->uc_mcontext.uc_regs->gregs [PT_NIP])
- #define UCONTEXT_REG_LNK(ctx) (((os_ucontext*)(ctx))->uc_mcontext.uc_regs->gregs [PT_LNK])
- #endif
--#elif defined (__APPLE__) && defined (_STRUCT_MCONTEXT)
-+#elif defined (__APPLE__)
-+# if __DARWIN_UNIX03
- typedef struct __darwin_ucontext os_ucontext;
-
- #define UCONTEXT_REG_Rn(ctx, n) ((&((os_ucontext*)(ctx))->uc_mcontext->__ss.__r0) [(n)])
- #define UCONTEXT_REG_FPRn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext->__fs.__fpregs [(n)])
- #define UCONTEXT_REG_NIP(ctx) (((os_ucontext*)(ctx))->uc_mcontext->__ss.__srr0)
- #define UCONTEXT_REG_LNK(ctx) (((os_ucontext*)(ctx))->uc_mcontext->__ss.__lr)
--#elif defined (__APPLE__) && !defined (_STRUCT_MCONTEXT)
-+# else
- typedef struct ucontext os_ucontext;
-
- #define UCONTEXT_REG_Rn(ctx, n) ((&((os_ucontext*)(ctx))->uc_mcontext->ss.r0) [(n)])
- #define UCONTEXT_REG_FPRn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext->fs.fpregs [(n)])
- #define UCONTEXT_REG_NIP(ctx) (((os_ucontext*)(ctx))->uc_mcontext->ss.srr0)
- #define UCONTEXT_REG_LNK(ctx) (((os_ucontext*)(ctx))->uc_mcontext->ss.lr)
-+# endif
- #elif defined(__NetBSD__)
- typedef ucontext_t os_ucontext;
-
Added: trunk/dports/devel/mono/files/snowleopard-mutex.patch
===================================================================
--- trunk/dports/devel/mono/files/snowleopard-mutex.patch (rev 0)
+++ trunk/dports/devel/mono/files/snowleopard-mutex.patch 2013-11-11 18:55:10 UTC (rev 113183)
@@ -0,0 +1,22 @@
+--- mono/utils/mono-mutex.c.orig 2013-11-11 08:51:27.000000000 -0800
++++ mono/utils/mono-mutex.c 2013-11-11 08:53:13.000000000 -0800
+@@ -28,7 +28,10 @@
+
+ #if defined(__APPLE__)
+ #define _DARWIN_C_SOURCE
++#include <AvailabilityMacros.h>
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+ #include <pthread_spis.h>
++#endif
+ #include <dlfcn.h>
+ #endif
+
+@@ -133,7 +136,7 @@ This problem was witnessed on OSX in mon
+ int
+ mono_mutex_init_suspend_safe (mono_mutex_t *mutex)
+ {
+-#if defined(__APPLE__)
++#if defined(__APPLE__) && defined(_PTHREAD_MUTEX_POLICY_FIRSTFIT)
+ int res;
+ pthread_mutexattr_t attr;
+ static gboolean inited;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131111/9d60357a/attachment.html>
More information about the macports-changes
mailing list