diff options
author | Jesse Gilles <jgilles@multitech.com> | 2010-05-27 12:26:45 -0500 |
---|---|---|
committer | Jesse Gilles <jgilles@multitech.com> | 2010-05-27 12:26:45 -0500 |
commit | 277880cbe75bd05cb87ea5ea9330f4b91a0e81b0 (patch) | |
tree | 24b2b58aa7a6628b8639043fd1969605726bcbb6 /recipes/mono/mono-1.2.5.1/configure.patch | |
parent | 9db3b8621a20c1be4a7b13fc87c690bbe0fd8032 (diff) |
mono: Add version 2.6.3
* Removed old versions of mono as they were broken.
* Fixed mono packages so mono now builds with new native staging.
* Changed mono floating point to ARM_FPU_NONE so it works with all architectures.
* Added libtoolize --force --copy to mono.inc to allow any libtool version to work.
Conflicts:
recipes/mono/mono-mcs-intermediate_1.2.5.1.bb
recipes/mono/mono-mcs-intermediate_1.2.6.bb
recipes/mono/mono-mcs-intermediate_1.9.1+2.2-rc1.bb
recipes/mono/mono-mcs-intermediate_2.6.3.bb
recipes/mono/mono-native_1.2.5.1.bb
recipes/mono/mono-native_1.9.1+2.2-rc1.bb
recipes/mono/mono-native_2.6.3.bb
recipes/mono/mono_1.2.5.1.bb
recipes/mono/mono_1.2.6.bb
recipes/mono/mono_1.9.1+2.2-rc1.bb
recipes/mono/mono_2.6.3.bb
Diffstat (limited to 'recipes/mono/mono-1.2.5.1/configure.patch')
-rw-r--r-- | recipes/mono/mono-1.2.5.1/configure.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/recipes/mono/mono-1.2.5.1/configure.patch b/recipes/mono/mono-1.2.5.1/configure.patch deleted file mode 100644 index 1553115c0e..0000000000 --- a/recipes/mono/mono-1.2.5.1/configure.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: mono-1.2.5/configure.in -=================================================================== ---- mono-1.2.5.orig/configure.in -+++ mono-1.2.5/configure.in -@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then - ], [ - AC_MSG_RESULT(no) - with_tls=pthread -+ ], [ -+ AC_MSG_RESULT(yes) - ]) - fi - -@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then - ], [ - with_sigaltstack=no - AC_MSG_RESULT(no) -+ ], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) - ]) - fi - -@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then - ]) - fi - --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, [ -- AC_TRY_COMPILE([], [ -- __asm__ ("fldd d0, [r0]"); -- ], fpu=VFP, fpu=NONE) -- ]) -+#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, [ -+# AC_TRY_COMPILE([], [ -+# __asm__ ("fldd d0, [r0]"); -+# ], fpu=VFP, fpu=NONE) -+# ]) -+# -+# AC_MSG_RESULT($fpu) -+# CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -+# unset fpu -+#fi - -- AC_MSG_RESULT($fpu) -- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -- unset fpu --fi -+ CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" - - if test ${TARGET} = unknown; then - CPPFLAGS="$CPPFLAGS -DNO_PORT" |