diff options
Diffstat (limited to 'lang/mono/patches/patch-ab')
| -rw-r--r-- | lang/mono/patches/patch-ab | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index af0aef8ffe1..9b6eb9b6c54 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,14 +1,18 @@ -$NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $ +$NetBSD: patch-ab,v 1.21 2010/01/15 19:41:23 drochner Exp $ ---- configure.orig 2009-03-13 15:51:11.000000000 +0100 +--- configure.orig 2009-12-28 19:58:39.000000000 +0000 +++ configure -@@ -2939,11 +2939,11 @@ _ACEOF +@@ -3058,11 +3058,15 @@ _ACEOF CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes - libdl="-ldl" + libdl="-ldl /libexec/ld.elf_so" libgc_threads=pthreads ++ cat >>confdefs.h <<\_ACEOF ++#define PTHREAD_POINTER_ID 1 ++_ACEOF ++ with_sigaltstack=no ;; - *-*-*freebsd*) @@ -16,7 +20,7 @@ $NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $ platform_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" -@@ -2959,7 +2959,8 @@ _ACEOF +@@ -3078,7 +3082,8 @@ _ACEOF LDFLAGS="$LDFLAGS $PTHREAD_LIBS" libmono_ldflags="$PTHREAD_LIBS" fi @@ -26,36 +30,16 @@ $NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $ need_link_unlink=yes cat >>confdefs.h <<\_ACEOF -@@ -32274,6 +32275,9 @@ cat >>conftest.$ac_ext <<_ACEOF - /* 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" -@@ -32314,6 +32318,9 @@ cat confdefs.h >>conftest.$ac_ext - 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 -@@ -39626,7 +39633,7 @@ LIBC="libc.so.6" +@@ -31859,7 +31864,7 @@ LIBC="libc.so.6" INTL="libc.so.6" SQLITE="libsqlite.so.0" SQLITE3="libsqlite3.so.0" -X11="libX11.so" -+X11="@X11BASE@/lib/libX11.so" ++X11="/usr/pkg/lib/libX11.so" sizeof_register="SIZEOF_VOID_P" -@@ -40046,10 +40053,10 @@ case "$host" in +@@ -32309,10 +32314,10 @@ case "$host" in X11="libX11.dylib" ;; *-*-*netbsd*) @@ -69,3 +53,23 @@ $NetBSD: patch-ab,v 1.20 2009/10/11 07:49:49 kefren Exp $ LIBC="libc.so" INTL="libintl.so" ;; +@@ -32613,6 +32618,9 @@ cat >>conftest.$ac_ext <<_ACEOF + /* 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" +@@ -32654,6 +32662,9 @@ cat confdefs.h >>conftest.$ac_ext + 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 |