[Pkg-mono-svn-commits] rev 3260 - in mono/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Mon Aug 6 10:31:46 UTC 2007
Author: slomo
Date: 2007-08-06 10:31:46 +0000 (Mon, 06 Aug 2007)
New Revision: 3260
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch
Log:
* Sebastian 'slomo' Dr?\195?\182ge:
+ debian/patches/armel_fix_configure_fpu_check.dpatch:
- Regenerate configure for the change.
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2007-07-22 17:51:04 UTC (rev 3259)
+++ mono/trunk/debian/changelog 2007-08-06 10:31:46 UTC (rev 3260)
@@ -17,6 +17,9 @@
(Thanks to Chris Howie <cdhowie at nerdshack.com> for investigation)
+ debian/rules:
- Use softfloat on armel.
+ * Sebastian 'slomo' Dröge:
+ + debian/patches/armel_fix_configure_fpu_check.dpatch:
+ - Regenerate configure for the change.
-- Mirco Bauer <meebey at debian.org> Sat, 21 Jul 2007 15:48:05 +0200
Modified: mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch
===================================================================
--- mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch 2007-07-22 17:51:04 UTC (rev 3259)
+++ mono/trunk/debian/patches/armel_fix_configure_fpu_check.dpatch 2007-08-06 10:31:46 UTC (rev 3260)
@@ -47,14 +47,182 @@
--with-jit=yes,no If you want to build scripts that default to the JIT
--with-interp=yes,no If you want to build scripts that default to the interpreter
--with-x use the X Window System
-+ --with-fpu=FPA,VFP,NONE Select fpu to use on arm
++ --with-fpu=FPA,VFP,NONE Select fpu to use on arm
--with-preview=yes,no If you want to install the 2.0 FX preview
Some influential environment variables:
-@@ -40074,23 +40075,31 @@
+@@ -6531,7 +6532,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6534 "configure"' > conftest.$ac_ext
++ echo '#line 6535 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9330,11 +9331,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9333: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9337: \$? = $ac_status" >&5
++ echo "$as_me:9338: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9598,11 +9599,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9605: \$? = $ac_status" >&5
++ echo "$as_me:9606: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9702,11 +9703,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9705: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9706: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9709: \$? = $ac_status" >&5
++ echo "$as_me:9710: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -12154,7 +12155,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12157 "configure"
++#line 12158 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12254,7 +12255,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12257 "configure"
++#line 12258 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14622,11 +14623,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14625: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14626: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14629: \$? = $ac_status" >&5
++ echo "$as_me:14630: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -14726,11 +14727,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14730: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14733: \$? = $ac_status" >&5
++ echo "$as_me:14734: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16296,11 +16297,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16299: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16300: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16303: \$? = $ac_status" >&5
++ echo "$as_me:16304: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16400,11 +16401,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16403: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16407: \$? = $ac_status" >&5
++ echo "$as_me:16408: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18630,11 +18631,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18633: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18634: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18637: \$? = $ac_status" >&5
++ echo "$as_me:18638: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18898,11 +18899,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18901: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18902: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18905: \$? = $ac_status" >&5
++ echo "$as_me:18906: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -19002,11 +19003,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:19005: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19006: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:19009: \$? = $ac_status" >&5
++ echo "$as_me:19010: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -40074,11 +40075,20 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++
+# Check whether --with-fpu was given.
+if test "${with_fpu+set}" = set; then
+ withval=$with_fpu; fpu=$withval
@@ -62,125 +230,48 @@
+
+
if test ${TARGET} = ARM; then
-- { echo "$as_me:$LINENO: checking which FPU to use" >&5
-+ { echo "$as_me:$LINENO: checking which FPU to use" >&5
+ { echo "$as_me:$LINENO: checking which FPU to use" >&5
echo $ECHO_N "checking which FPU to use... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-+ if test "x$fpu" = "x"; then
++ if test "x$fpu" = "x"; then
+
-+ cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--
-+
- int
+@@ -40089,7 +40099,7 @@
main ()
{
- __asm__ ("ldfd f0, [r0]");
--
-+ __asm__ ("ldfd f0, [r0]");
-+
++ __asm__ ("ldfd f0, [r0]");
+
;
return 0;
- }
-@@ -40108,45 +40117,28 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fpu=FPA
- else
- echo "$as_me: failed program was:" >&5
+@@ -40135,7 +40145,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- int
+@@ -40146,7 +40156,7 @@
main ()
{
--
+
- __asm__ ("fldd d0, [r0]");
-+
-+ __asm__ ("fldd d0, [r0]");
++ __asm__ ("fldd d0, [r0]");
;
return 0;
-@@ -40165,35 +40157,19 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- fpu=VFP
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- fpu=NONE
-+ fpu=NONE
+@@ -40199,6 +40209,7 @@
fi
-+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ fi
- fi
+ { echo "$as_me:$LINENO: result: $fpu" >&5
+ echo "${ECHO_T}$fpu" >&6; }
More information about the Pkg-mono-svn-commits
mailing list