[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.10.8.1-4

[Jo Shields]

The following commit has been merged in the master branch:
commit 8d2d51fe9ea7f9f79f942576c80fd1e8d933a6a5
Merge: 10b15d4f526687a5a314f5a6aa724f8dd8b596f6 f77ef2f3f6a8a657fa5d320914e849c4621c4400
Author: Jo Shields <directhex at apebox.org>
Date:   Sun May 27 15:27:39 2012 +0100

    Merge branch 'master-patches/search_multiarch_path_for_libX11'

diff --combined configure.in
index 810576c,af368da..c042dfa
--- a/configure.in
+++ b/configure.in
@@@ -128,17 -128,6 +128,17 @@@ case "$host" i
  		with_sigaltstack=no
  		use_sigposix=yes
  		;;
 +	*-*-kfreebsd*-gnu)
 +		platform_win32=no
 +		CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread"
 +		libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread"
 +		libmono_ldflags="-lpthread -pthread"
 +		libdl="-ldl"
 +		libgc_threads=pthreads
 +		need_link_unlink=yes
 +		with_sigaltstack=no
 +		use_sigposix=yes
 +		;;
  	*-*-*freebsd*)
  		host_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
@@@ -2224,7 -2213,7 +2224,7 @@@ case "$host" i
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
 -		  darwin*|openbsd*|freebsd*)
 +		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  		        ;;
  		esac
@@@ -2239,7 -2228,7 +2239,7 @@@
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
 -		  darwin*|openbsd*|freebsd*)
 +		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  			;;
  		esac
@@@ -2570,11 -2559,6 +2570,11 @@@ case "$host" i
  	LIBC="libc.so.12"
  	INTL="libintl.so.0"
  	;;
 +     *-*-kfreebsd*-gnu)
 +	LIBC="libc.so.0.1"
 +	INTL="libc.so.0.1"
 +	X11="libX11.so.6"
 +	;;
      *-*-*freebsd*)
      	LIBC="libc.so"
  	INTL="libintl.so"
@@@ -2590,7 -2574,7 +2590,7 @@@
      *-*-*linux*)
  	AC_PATH_X
  	AC_MSG_CHECKING(for the soname of libX11.so)
- 	for i in $x_libraries /usr/lib /usr/lib64; do
+ 	for i in $x_libraries /usr/lib /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/; do
  		for r in 4 5 6; do
  			if test -f $i/libX11.so.$r; then
  				X11=libX11.so.$r
@@@ -2671,24 -2655,15 +2671,24 @@@ if test "x$with_tls" = "x__thread"; the
  	])
  fi
  
 -if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
 +AC_ARG_WITH(fpu, [ --with-fpu=FPA,VFP,NONE    Select fpu to use on arm],[fpu=$withval])
 +
 +if test ${TARGET} = ARM; then
  	dnl ******************************************
  	dnl *** Check to see what FPU is available ***
  	dnl ******************************************
  	AC_MSG_CHECKING(which FPU to use)
  
 -	AC_TRY_COMPILE([], [
 -		__asm__ ("ldfd f0, [r0]");
 -		], fpu=FPA, fpu=NONE)
 +	if test "x$fpu" = "x"; then
 +
 +		AC_TRY_COMPILE([], [
 +			__asm__ ("ldfd f0, [r0]");
 +		], fpu=FPA, [
 +				AC_TRY_COMPILE([], [
 +					__asm__ ("fldd d0, [r0]");
 +				], fpu=VFP, fpu=NONE)
 +		])
 +	fi
  
  	AC_MSG_RESULT($fpu)
  	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"

-- 
mono