$NetBSD: patch-ab,v 1.32 2013/09/13 20:47:55 jperkin Exp $ --- configure.orig 2013-04-25 09:08:54.000000000 +0000 +++ configure @@ -3843,7 +3843,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1 mono_cv_clang=no if test "x$cross_compiling" = "xno"; then target_win32=yes - if test "x$host" == "x$build" -a "x$host" == "x$target"; then + if test "x$host" = "x$build" -a "x$host" = "x$target"; then $as_echo "#define TARGET_WIN32 1" >>confdefs.h @@ -3895,12 +3895,15 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes - libdl="-ldl" + libdl="-ldl /libexec/ld.elf_so" libgc_threads=pthreads with_sigaltstack=no use_sigposix=yes + cat >>confdefs.h <<\_ACEOF +#define PTHREAD_POINTER_ID 1 +_ACEOF ;; - *-*-*freebsd*) + *-*-*freebsd* | *-*-*dragonfly*) host_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" @@ -3916,7 +3919,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib" libmono_ldflags="$PTHREAD_LIBS" fi - CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" + CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6 -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP" + libmono_cflags="$libmono_cflags -D_REENTRANT" need_link_unlink=yes $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h @@ -21395,6 +21399,7 @@ $as_echo_n "checking for Solaris XPG4 su if test -f /usr/lib/libxnet.so; then CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" + CPPFLAGS="$CPPFLAGS -D__C99FEATURES__" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1" LIBS="$LIBS -lxnet" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -24527,7 +24532,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" sizeof_register="SIZEOF_VOID_P" @@ -24635,6 +24640,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co sizeof_register=8 fi case $host_os in + solaris*) + LIBC="libc.so" + INTL="libintl.so" + have_visibility_hidden=no + ;; linux*) sgen_supported=true AOT_SUPPORTED="yes" @@ -24765,13 +24775,17 @@ fi NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6" sgen_supported=true ;; - arm*-linux*) + arm*-linux* | arm*-netbsd* | earm*-netbsd*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - sgen_supported=true - AOT_SUPPORTED="yes" + case $host_os in + linux*) + sgen_supported=true + AOT_SUPPORTED="yes" + ;; + esac if test "x$cross_compiling" != "xno"; then # Provide sane defaults when cross-compiling CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6=1" @@ -25132,10 +25146,12 @@ case "$host" in X11="libX11.dylib" ;; *-*-*netbsd*) - LIBC="libc.so.12" - INTL="libintl.so.0" + LIBC="libc.so" + INTL="libintl.so" + SQLITE="libsqlite.so" + SQLITE3="libsqlite3.so" ;; - *-*-*freebsd*) + *-*-*freebsd* | *-*-*dragonfly*) LIBC="libc.so" INTL="libintl.so" SQLITE="libsqlite.so" @@ -26162,7 +26178,6 @@ else fi -ac_config_files="$ac_config_files po/mcs/Makefile.in" ac_config_files="$ac_config_files runtime/mono-wrapper"