diff options
Diffstat (limited to 'lang/mono/patches')
-rw-r--r-- | lang/mono/patches/patch-ab | 33 | ||||
-rw-r--r-- | lang/mono/patches/patch-ae | 17 | ||||
-rw-r--r-- | lang/mono/patches/patch-da | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-db | 24 | ||||
-rw-r--r-- | lang/mono/patches/patch-dc | 11 | ||||
-rw-r--r-- | lang/mono/patches/patch-dd | 23 | ||||
-rw-r--r-- | lang/mono/patches/patch-de | 11 | ||||
-rw-r--r-- | lang/mono/patches/patch-df | 11 |
8 files changed, 132 insertions, 10 deletions
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index 7cb5a615147..4b419793a92 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,7 +1,6 @@ -$NetBSD: patch-ab,v 1.15 2008/11/19 11:17:49 kefren Exp $ ---- configure.orig 2008-02-05 14:21:50.000000000 +0200 -+++ configure 2008-02-05 14:24:06.000000000 +0200 -@@ -2890,7 +2890,7 @@ +--- configure.orig 2009-01-09 07:56:07 -0800 ++++ configure 2009-03-03 16:24:30 -0800 +@@ -2938,11 +2938,11 @@ CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes @@ -10,4 +9,28 @@ $NetBSD: patch-ab,v 1.15 2008/11/19 11:17:49 kefren Exp $ libgc_threads=pthreads with_sigaltstack=no ;; - # these flags will work for all versions of -STABLE +- *-*-*freebsd*) ++ *-*-*freebsd* | *-*-*dragonfly*) + platform_win32=no + if test "x$PTHREAD_CFLAGS" = "x"; then + CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" +@@ -32216,6 +32216,9 @@ + /* end confdefs.h. */ + $ac_includes_default + #include <$ac_header> ++#ifdef __DragonFly__ ++#error extattr ++#endif + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -32256,6 +32259,9 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <$ac_header> ++#ifdef __DragonFly__ ++#error extattr ++#endif + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in diff --git a/lang/mono/patches/patch-ae b/lang/mono/patches/patch-ae index cda724cf7ca..d9f40c24686 100644 --- a/lang/mono/patches/patch-ae +++ b/lang/mono/patches/patch-ae @@ -1,8 +1,6 @@ -$NetBSD: patch-ae,v 1.8 2006/01/03 08:03:53 recht Exp $ - ---- libgc/configure.orig 2005-12-22 18:35:37.000000000 +0100 -+++ libgc/configure -@@ -3940,7 +3940,27 @@ _ACEOF +--- libgc/configure.orig 2009-01-09 07:56:17 -0800 ++++ libgc/configure 2009-03-03 15:25:59 -0800 +@@ -4604,7 +4604,27 @@ _ACEOF ;; @@ -31,3 +29,12 @@ $NetBSD: patch-ae,v 1.8 2006/01/03 08:03:53 recht Exp $ cat >>confdefs.h <<\_ACEOF #define GC_AIX_THREADS 1 _ACEOF +@@ -4637,7 +4657,7 @@ + + THREADDLLIBS="-lpthread -lrt" + ;; +- *-*-freebsd*) ++ *-*-freebsd* | *-*-*dragonfly*) + cat >>confdefs.h <<\_ACEOF + #define GC_FREEBSD_THREADS 1 + _ACEOF diff --git a/lang/mono/patches/patch-da b/lang/mono/patches/patch-da new file mode 100644 index 00000000000..23e020cc745 --- /dev/null +++ b/lang/mono/patches/patch-da @@ -0,0 +1,12 @@ +--- libgc/include/private/gcconfig.h.orig 2009-03-03 14:22:28 -0800 ++++ libgc/include/private/gcconfig.h 2009-03-03 14:24:56 -0800 +@@ -351,6 +351,9 @@ + # define OPENBSD + # define mach_type_known + # endif ++# if defined(__DragonFly__) ++# define FREEBSD ++# endif + # if defined(FREEBSD) && (defined(i386) || defined(__i386__)) + # define I386 + # define mach_type_known diff --git a/lang/mono/patches/patch-db b/lang/mono/patches/patch-db new file mode 100644 index 00000000000..fb1bf79f957 --- /dev/null +++ b/lang/mono/patches/patch-db @@ -0,0 +1,24 @@ +--- mono/utils/mono-proclib.c.orig 2008-11-10 20:56:14 -0800 ++++ mono/utils/mono-proclib.c 2009-03-03 15:30:03 -0800 +@@ -13,14 +13,19 @@ + #endif + + /* FIXME: bsds untested */ +-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #include <sys/types.h> + #include <sys/sysctl.h> ++#ifndef __DragonFly__ + #include <sys/proc.h> ++#endif + #ifdef HAVE_SYS_USER_H + #include <sys/user.h> + #endif +-#ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC ++#ifdef __DragonFly__ ++#define kinfo_pid_member kp_pid ++#define kinfo_name_member kp_comm ++#elif HAVE_STRUCT_KINFO_PROC_KP_PROC + #define kinfo_pid_member kp_proc.p_pid + #define kinfo_name_member kp_proc.p_comm + #else diff --git a/lang/mono/patches/patch-dc b/lang/mono/patches/patch-dc new file mode 100644 index 00000000000..efb0641c4c3 --- /dev/null +++ b/lang/mono/patches/patch-dc @@ -0,0 +1,11 @@ +--- mono/mini/mini-x86.h.orig 2009-03-03 16:01:51 -0800 ++++ mono/mini/mini-x86.h 2009-03-03 16:02:17 -0800 +@@ -194,7 +194,7 @@ + #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.gregs [REG_EIP]) + #endif + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) + # define SC_EAX sc_eax + # define SC_EBX sc_ebx + # define SC_ECX sc_ecx diff --git a/lang/mono/patches/patch-dd b/lang/mono/patches/patch-dd new file mode 100644 index 00000000000..b9d260b957e --- /dev/null +++ b/lang/mono/patches/patch-dd @@ -0,0 +1,23 @@ +--- mono/metadata/attach.c.orig 2009-03-03 15:32:27 -0800 ++++ mono/metadata/attach.c 2009-03-03 15:48:41 -0800 +@@ -366,12 +366,20 @@ ipc_connect (void) + */ + /* FIXME: Use TMP ? */ + pw = NULL; ++#ifndef HAVE_GETPWUID_R ++ pw = getpwuid(getuid()); ++ if (pw == NULL) { ++ fprintf(stderr, "attach: getpwuid () failed.\n"); ++ return; ++ } ++#else + res = getpwuid_r (getuid (), &pwbuf, buf, sizeof (buf), &pw); + if (res != 0) { + fprintf (stderr, "attach: getpwuid_r () failed.\n"); + return; + } + g_assert (pw); ++#endif + directory = g_strdup_printf ("/tmp/mono-%s", pw->pw_name); + res = mkdir (directory, S_IRUSR | S_IWUSR | S_IXUSR); + if (res != 0) { diff --git a/lang/mono/patches/patch-de b/lang/mono/patches/patch-de new file mode 100644 index 00000000000..794564eb289 --- /dev/null +++ b/lang/mono/patches/patch-de @@ -0,0 +1,11 @@ +--- ikvm-native/jni.c.orig 2009-03-03 16:07:20 -0800 ++++ ikvm-native/jni.c 2009-03-03 16:07:43 -0800 +@@ -28,7 +28,7 @@ + #include <malloc.h> + #define ALLOCA _alloca + #else +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #include <stdlib.h> + #else + #include <alloca.h> diff --git a/lang/mono/patches/patch-df b/lang/mono/patches/patch-df new file mode 100644 index 00000000000..79c4d8d663f --- /dev/null +++ b/lang/mono/patches/patch-df @@ -0,0 +1,11 @@ +--- support/mph.h.orig 2009-03-03 16:39:06 -0800 ++++ support/mph.h 2009-03-03 16:39:21 -0800 +@@ -36,7 +36,7 @@ + #include <stdint.h> /* for SIZE_MAX */ + #endif + +-#if __APPLE__ || __BSD__ || __FreeBSD__ ++#if __APPLE__ || __BSD__ || __FreeBSD__ || __DragonFly__ + #define MPH_ON_BSD + #endif + |