pkgsrc-ng/lang/mono/patches/patch-configure

$NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $

--- configure.orig	2015-08-04 07:48:54.000000000 +0000
+++ configure
@@ -3983,7 +3983,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
 
@@ -4020,10 +4020,13 @@ $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
 		;;
 	*-*-kfreebsd*-gnu)
 		host_win32=no
@@ -4036,7 +4039,7 @@ $as_echo "#define MINGW_CROSS_COMPILE 1"
 		with_sigaltstack=no
 		use_sigposix=yes
 		;;
-	*-*-*freebsd*)
+	*-*-*freebsd* | *-*-*dragonfly*)
 		host_win32=no
 		if test "x$PTHREAD_CFLAGS" = "x"; then
 			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
@@ -4052,7 +4055,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
@@ -21999,9 +22003,7 @@ done
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris XPG4 support" >&5
 $as_echo_n "checking for Solaris XPG4 support... " >&6; }
 			if test -f /usr/lib/libxnet.so; then
-				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
 	    			CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
-				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
            			LIBS="$LIBS -lxnet"
   	    			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -25084,7 +25086,7 @@ else
   test_perf_events=no
 fi
 
-if test "x$test_perf_events" == "xyes"; then
+if test "x$test_perf_events" = "xyes"; then
 
 $as_echo "#define ENABLE_PERF_EVENTS 1" >>confdefs.h
 
@@ -25422,7 +25424,7 @@ $as_echo_n "checking LLVM version... " >
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvm_version" >&5
 $as_echo "$llvm_version" >&6; }
    if echo $llvm_version | grep -q 'mono'; then
-	  if test "x$enable_llvm_version_check" == "xyes"; then
+	  if test "x$enable_llvm_version_check" = "xyes"; then
 	  	 if test "$llvm_version" != "$expected_llvm_version"; then
 	  	 	as_fn_error $? "Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version\"" "$LINENO" 5
 	  	 fi
@@ -25504,7 +25506,7 @@ LIBC="libc.so.6"
 INTL="libc.so.6"
 SQLITE="libsqlite.so.0"
 SQLITE3="libsqlite3.so.0"
-X11="libX11.so"
+X11="/usr/X11R7/lib/libX11.so"
 GDKX11="libgdk-x11-2.0.so.0"
 GTKX11="libgtk-x11-2.0.so.0"
 XINERAMA="libXinerama.so.1"
@@ -25608,6 +25610,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"
@@ -25739,12 +25746,15 @@ fi
 		CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
 		sgen_supported=true
 		;;
-	arm*-linux*)
+	arm*-linux* | arm*-netbsd* | earm*-netbsd*)
 		TARGET=ARM;
 		arch_target=arm;
 		ACCESS_UNALIGNED="no"
-		sgen_supported=true
-		AOT_SUPPORTED="yes"
+		case $host_os in
+		  *linux)
+			sgen_supported=true
+			AOT_SUPPORTED="yes"
+		esac
 		CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
 		;;
 # TODO: make proper support for NaCl host.
@@ -25854,7 +25864,7 @@ $as_echo "#define TARGET_X86 1" >>confde
 
 		sizeof_register=4
 		;;
-   arm*-linux-*)
+   arm*-linux-* | arm*-netbsd* | earm*-netbsd*)
 		TARGET=ARM;
 		arch_target=arm;
 
@@ -26198,15 +26208,17 @@ case "$host" in
 	GTKX11="libgtk-x11-2.0.dylib"
 	;;
      *-*-*netbsd*)
-	LIBC="libc.so.12"
-	INTL="libintl.so.0"
+	LIBC="libc.so"
+	INTL="libintl.so"
+	SQLITE="libsqlite.so"
+	SQLITE3="libsqlite3.so"
 	;;
      *-*-kfreebsd*-gnu)
 	LIBC="libc.so.0.1"
 	INTL="libc.so.0.1"
 	X11="libX11.so.6"
 	;;
-    *-*-*freebsd*)
+    *-*-*freebsd* | *-*-*dragonfly*)
     	LIBC="libc.so"
 	INTL="libintl.so"
 	SQLITE="libsqlite.so"
@@ -27193,7 +27205,6 @@ else
 fi
 
 
-ac_config_files="$ac_config_files po/mcs/Makefile.in"
 
 
 ac_config_files="$ac_config_files runtime/mono-wrapper"