SHA256
1
0
forked from pool/mono-core
Andrew Jorgensen 2010-03-02 20:15:50 +00:00 committed by Git OBS Bridge
parent 8ac1d6258e
commit 16a0f71b62
5 changed files with 31 additions and 52 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bd6cc59b740bb3a971a6315f3a85fdfdf5cf1e94545e915ba96c3ea7224baa3
size 27644697

3
mono-2.6.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a74fab23eca73fad12c05304afc7f476555578edf97d5d81a646e8a9b625cb68
size 27753728

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 2 20:12:24 UTC 2010 - ajorgensen@novell.com
- Update to 2.6.3
* http://www.mono-project.com/Release_Notes_Mono_2.6.3
- Obsoleted patches
-------------------------------------------------------------------
Mon Mar 1 17:12:06 CET 2010 - ro@suse.de

View File

@ -20,15 +20,14 @@
%{!?ext_man: %define ext_man .gz}
Name: mono-core
License: LGPLv2.1
License: LGPL v2.1 only
Group: Development/Languages/Mono
Summary: A .NET Runtime Environment
Url: http://go-mono.org/
Version: 2.6.1
Release: 2
Version: 2.6.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mono-%{version}.tar.bz2
Patch0: xen-aot.patch
Patch1: mono-cleanup_crash.patch
ExclusiveArch: %ix86 x86_64 ppc ppc64 hppa armv4l sparc s390 ia64 s390x
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -274,7 +273,7 @@ fi
%postun -p /sbin/ldconfig
%package -n mono-jscript
License: LGPLv2.1
License: LGPL v2.1 only
Summary: JScript .NET support for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -301,7 +300,7 @@ Authors:
%_prefix/lib/mono/2.0/Microsoft.JScript.dll
%package -n mono-locale-extras
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Extra locale information
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -339,7 +338,7 @@ Authors:
%_prefix/lib/mono/2.0/I18N.Other.dll
%package -n mono-data
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -404,7 +403,7 @@ Authors:
%_prefix/lib/mono/2.0/System.Data.DataSetExtensions.dll
%package -n mono-winforms
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Mono's Windows Forms implementation
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -448,7 +447,7 @@ Authors:
%_prefix/lib/mono/gac/Mono.WebBrowser
%package -n ibm-data-db2
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for DB2
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -477,7 +476,7 @@ Authors:
%_prefix/lib/mono/2.0/IBM.Data.DB2.dll
%package -n mono-extras
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Extra packages
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -517,7 +516,9 @@ Authors:
%_prefix/lib/mono/2.0/System.Management.dll
%_prefix/lib/mono/gac/RabbitMQ.Client
%_prefix/lib/mono/1.0/RabbitMQ.Client.dll
%_prefix/lib/mono/1.0/RabbitMQ.Client.Apigen.exe*
%_prefix/lib/mono/2.0/RabbitMQ.Client.dll
%_prefix/lib/mono/2.0/RabbitMQ.Client.Apigen.exe*
%_prefix/lib/mono/gac/System.Messaging
%_prefix/lib/mono/1.0/System.Messaging.dll
%_prefix/lib/mono/2.0/System.Messaging.dll
@ -538,7 +539,7 @@ Authors:
%_prefix/lib/mono/2.0/Microsoft.Vsa.dll
%package -n mono-data-sqlite
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -573,7 +574,7 @@ Authors:
%_prefix/lib/mono/2.0/Mono.Data.Sqlite.dll
%package -n mono-data-sybase
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -773,7 +774,7 @@ Authors:
%config %_sysconfdir/mono/2.0/Browsers
%package -n mono-data-oracle
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -803,7 +804,7 @@ Authors:
%_prefix/lib/mono/2.0/System.Data.OracleClient.dll
%package -n mono-data-postgresql
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -833,7 +834,7 @@ Authors:
%_prefix/lib/mono/2.0/Npgsql.dll
%package -n bytefx-data-mysql
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -863,13 +864,13 @@ Authors:
%_prefix/lib/mono/2.0/ByteFX.Data.dll
%package -n mono-nunit
License: LGPLv2.1
License: LGPL v2.1 only
Summary: NUnit Testing Framework
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
%package -n mono-data-firebird
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -941,7 +942,7 @@ Authors:
%_libdir/pkgconfig/mono-nunit.pc
%package -n mono-devel
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Mono development tools
Group: Development/Languages/Mono
Requires: mono-core == %version-%release
@ -1143,7 +1144,7 @@ Authors:
# yet gzipped
%package -n monodoc-core
License: LGPLv2.1
License: LGPL v2.1 only
Summary: Monodoc - Documentation tools for C# code
Group: Development/Tools/Other
Provides: monodoc
@ -1185,7 +1186,7 @@ Monodoc-core contains documentation tools for C#.
%{_mandir}/man5/mdoc.5%ext_man
%package -n mono-complete
License: LGPLv2.1
License: LGPL v2.1 only
Summary: A .NET Runtime Environment
Group: Development/Languages/Mono
Requires: bytefx-data-mysql = %version-%release
@ -1230,7 +1231,6 @@ Authors:
%prep
%setup -q -n mono-%{version}
%patch0
%patch1
%build

View File

@ -1,28 +0,0 @@
Index: mono/mini/mini-amd64.c
===================================================================
--- mono/mini/mini-amd64.c (revision 149672)
+++ mono/mini/mini-amd64.c (revision 149673)
@@ -2558,11 +2558,6 @@
/* These methods are allocated using malloc */
near_call = FALSE;
- if (cfg->compile_aot) {
- near_call = TRUE;
- no_patch = TRUE;
- }
-
#ifdef MONO_ARCH_NOMAP32BIT
near_call = FALSE;
#endif
@@ -2571,6 +2566,11 @@
if (optimize_for_xen)
near_call = FALSE;
+ if (cfg->compile_aot) {
+ near_call = TRUE;
+ no_patch = TRUE;
+ }
+
if (near_call) {
/*
* Align the call displacement to an address divisible by 4 so it does