diff --git a/mono-arm-cpuinfo-v5.patch b/mono-arm-cpuinfo-v5.patch index 38e2067..0619c4c 100644 --- a/mono-arm-cpuinfo-v5.patch +++ b/mono-arm-cpuinfo-v5.patch @@ -1,8 +1,8 @@ -Index: mono-2.10.6/mono/mini/mini-arm.c +Index: mono-3.0.2/mono/mini/mini-arm.c =================================================================== ---- mono-2.10.6.orig/mono/mini/mini-arm.c -+++ mono-2.10.6/mono/mini/mini-arm.c -@@ -592,6 +592,9 @@ mono_arch_cpu_optimizazions (guint32 *ex +--- mono-3.0.2.orig/mono/mini/mini-arm.c ++++ mono-3.0.2/mono/mini/mini-arm.c +@@ -721,6 +721,9 @@ mono_arch_cpu_optimizations (guint32 *ex v5_supported = TRUE; darwin = TRUE; iphone_abi = TRUE; diff --git a/mono-arm-cpuinfo-v7.patch b/mono-arm-cpuinfo-v7.patch index 6120866..3ea3c7f 100644 --- a/mono-arm-cpuinfo-v7.patch +++ b/mono-arm-cpuinfo-v7.patch @@ -1,8 +1,8 @@ -Index: mono-2.10.6/mono/mini/mini-arm.c +Index: mono-3.0.2/mono/mini/mini-arm.c =================================================================== ---- mono-2.10.6.orig/mono/mini/mini-arm.c -+++ mono-2.10.6/mono/mini/mini-arm.c -@@ -717,6 +717,11 @@ mono_arch_cpu_optimizazions (guint32 *ex +--- mono-3.0.2.orig/mono/mini/mini-arm.c ++++ mono-3.0.2/mono/mini/mini-arm.c +@@ -721,6 +721,11 @@ mono_arch_cpu_optimizations (guint32 *ex v5_supported = TRUE; darwin = TRUE; iphone_abi = TRUE; diff --git a/mono-arm-vfp.patch b/mono-arm-vfp.patch index 57961b9..27a6fd8 100644 --- a/mono-arm-vfp.patch +++ b/mono-arm-vfp.patch @@ -1,8 +1,18 @@ -Index: mono-2.10.6/configure +Index: mono-3.0.2/configure =================================================================== ---- mono-2.10.6.orig/configure -+++ mono-2.10.6/configure -@@ -23989,11 +23989,12 @@ main () +--- mono-3.0.2.orig/configure ++++ mono-3.0.2/configure +@@ -25018,9 +25018,6 @@ if test ${TARGET} = ARM && test x$cross_ + $as_echo_n "checking which FPU to use... " >&6; } + + fpu=NONE +- if gcc -v 2>&1 | grep -q -- '--with-float=hard'; then +- fpu=VFP_HARD +- fi + + if test x$fpu = xNONE; then + ORIG_CFLAGS=$CFLAGS +@@ -25063,11 +25060,12 @@ main () return 0; } _ACEOF @@ -18,5 +28,5 @@ Index: mono-2.10.6/configure +#fi +fpu=VFP rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fpu" >&5 diff --git a/mono-core.changes b/mono-core.changes index 938f108..fedaa5f 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 17 12:34:59 UTC 2012 - adrian@suse.de + +- fix patches for arm* +- do not detect hard fp support in gcc (mono is not supporting it yet for real) + ------------------------------------------------------------------- Sat Dec 15 20:13:00 UTC 2012 - sshaw@decriptor.com diff --git a/mono-core.spec b/mono-core.spec index da78ad8..f7b6e04 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -118,13 +118,13 @@ technologies that have been submitted to the ECMA for standardization. #rm -f libgc/libtool.m4 #autoreconf --force --install #autoreconf --force --install libgc +export CFLAGS=" %{optflags} -fno-strict-aliasing" %ifarch armv7l armv7hl export MONO_CPU_ARCH="armv7l-thumb" %endif %ifarch armv5el export MONO_CPU_ARCH="armv5el" %endif -export CFLAGS=" %{optflags} -fno-strict-aliasing" # distro specific configure options %if %llvm == yes export PATH=/opt/novell/llvm-mono/bin:$PATH @@ -173,6 +173,10 @@ RPM_BUILD_ROOT=%{buildroot}%{_prefix} /usr/lib/rpm/brp-compress rm %{buildroot}%{_prefix}%{_prefix} %fdupes %{buildroot}%{_prefix} %find_lang mcs +%if %sgen == no +# installed anyway but not packaged +rm %{buildroot}%{_bindir}/mono-sgen-gdb.py +%endif %clean rm -rf %{buildroot} @@ -772,7 +776,7 @@ Database connectivity for Mono. %package -n mono-wcf Summary: Mono implementation of WCF, Windows Communication Foundation -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version} @@ -822,7 +826,7 @@ Mono implementation of WCF, Windows Communication Foundation %package -n mono-winfxcore Summary: Mono implementation of core WinFX APIs -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version} @@ -848,7 +852,7 @@ Mono implementation of core WinFX APIs %package -n mono-web Summary: Mono implementation of ASP -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version} Obsoletes: mono-remoting @@ -966,7 +970,7 @@ Mono implementation of ASP.NET, Remoting and Web Services. %package -n mono-mvc Summary: Mono implementation of ASP -License: MIT ; MS-PL +License: MIT and MS-PL Group: Development/Languages/Mono Requires: mono-core = %{version}