Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-updates-src > by-pkgid > 1dbb49209b0b2fcadedb0498a8ae483c > files > 6

mono-3.12.1-1.1.mga5.src.rpm

--- mono-3.0.12/configure.in.orig	2013-07-06 14:22:54.866000000 +0200
+++ mono-3.0.12/configure.in	2013-07-06 14:30:38.044000000 +0200
@@ -3039,16 +3039,19 @@
 	unset fpu
 
 	if test x$cross_compiling = xno; then
-		AC_MSG_CHECKING(for ARMV6)
-		AC_TRY_RUN([
-			int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; }
-				], armv6=yes, armv6=no)
+		AC_ARG_WITH(armv6,  [  --with-armv6=yes,no If you want to check for armv6+ membarrier (defaults to yes)],[], [with_armv6=yes])
+		if test x$with_armv6 = xyes; then
+			AC_MSG_CHECKING(for ARMV6)
+			AC_TRY_RUN([
+				int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; }
+					], armv6=yes, armv6=no)
 
-		AC_MSG_RESULT($armv6)
-		if test ${armv6} = yes; then
-		   AC_DEFINE(HAVE_ARMV6, 1, "Host supports ARMV6 instructions")
-		   # libgc's gc_locks.h depends on this
-		   CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6"
+			AC_MSG_RESULT($armv6)
+			if test ${armv6} = yes; then
+		   	AC_DEFINE(HAVE_ARMV6, 1, "Host supports ARMV6 instructions")
+		   	# libgc's gc_locks.h depends on this
+		   	CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6"
+			fi
 		fi
 	fi
 fi