SHA256
1
0
forked from pool/mono-core

Accepting request 405528 from Mono:Factory

1

OBS-URL: https://build.opensuse.org/request/show/405528
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger 2016-07-01 07:52:18 +00:00 committed by Git OBS Bridge
commit 4575885319
16 changed files with 125 additions and 8244 deletions

View File

@ -1,94 +0,0 @@
commit 8332185abf23e2f27a536e6b7a08310aba8564fb
Author: Bill Seurer <seurer@linux.vnet.ibm.com>
Date: Tue Aug 18 09:36:23 2015 -0500
[ppc] Basic changes to allow mono to build and run on power BE
patch adapted to current mono 4.2.1.102
The patch of tramp-ppc.c was not from above commit
but is also required to avoid ppc64 build segfault.
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
mono/mini/mini-ppc.c | 10 ++++++++--
mono/mini/mini-trampolines.c | 5 ++++-
mono/mini/tramp-ppc.c | 4 ++++
mono/sgen/sgen-archdep.h | 4 ++--
4 files changed, 18 insertions(+), 5 deletions(-)
Index: mono-4.2.1/mono/mini/mini-ppc.c
===================================================================
--- mono-4.2.1.orig/mono/mini/mini-ppc.c
+++ mono-4.2.1/mono/mini/mini-ppc.c
@@ -1086,7 +1086,10 @@ get_call_info (MonoGenericSharingContext
cinfo->args [n].size = size;
/* It was 7, now it is 8 in LinuxPPC */
- if (fr <= PPC_LAST_FPARG_REG) {
+ if (fr <= PPC_LAST_FPARG_REG
+ // For non-native vararg calls the parms must go in storage
+ && !(!sig->pinvoke && (sig->call_convention == MONO_CALL_VARARG))
+ ) {
cinfo->args [n].regtype = RegTypeFP;
cinfo->args [n].reg = fr;
fr ++;
@@ -1177,7 +1180,10 @@ get_call_info (MonoGenericSharingContext
case MONO_TYPE_R8:
cinfo->args [n].size = 8;
/* It was 7, now it is 8 in LinuxPPC */
- if (fr <= PPC_LAST_FPARG_REG) {
+ if (fr <= PPC_LAST_FPARG_REG
+ // For non-native vararg calls the parms must go in storage
+ && !(!sig->pinvoke && (sig->call_convention == MONO_CALL_VARARG))
+ ) {
cinfo->args [n].regtype = RegTypeFP;
cinfo->args [n].reg = fr;
fr ++;
Index: mono-4.2.1/mono/mini/mini-trampolines.c
===================================================================
--- mono-4.2.1.orig/mono/mini/mini-trampolines.c
+++ mono-4.2.1/mono/mini/mini-trampolines.c
@@ -1066,7 +1066,10 @@ mono_delegate_trampoline (mgreg_t *regs,
}
}
}
- } else {
+ // If "delegate->method_ptr" is null mono_get_addr_from_ftnptr will fail if
+ // ftnptrs are being used. "method" would end up null on archtitectures without
+ // ftnptrs so we can just skip this.
+ } else if (delegate->method_ptr) {
ji = mono_jit_info_table_find (domain, mono_get_addr_from_ftnptr (delegate->method_ptr));
if (ji)
method = jinfo_get_method (ji);
Index: mono-4.2.1/mono/sgen/sgen-archdep.h
===================================================================
--- mono-4.2.1.orig/mono/sgen/sgen-archdep.h
+++ mono-4.2.1/mono/sgen/sgen-archdep.h
@@ -88,8 +88,8 @@
} while (0)
/* MS_BLOCK_SIZE must be a multiple of the system pagesize, which for some
- archs is 64k. */
-#if defined(TARGET_POWERPC64) && _CALL_ELF == 2
+ architectures is 64k. */
+#if defined(TARGET_POWERPC64)
#define ARCH_MIN_MS_BLOCK_SIZE (64*1024)
#define ARCH_MIN_MS_BLOCK_SIZE_SHIFT 16
#endif
Index: mono-4.2.1/mono/mini/tramp-ppc.c
===================================================================
--- mono-4.2.1.orig/mono/mini/tramp-ppc.c
+++ mono-4.2.1/mono/mini/tramp-ppc.c
@@ -625,8 +625,12 @@ mono_arch_get_nullified_class_init_tramp
g_assert (code - buf <= tramp_size);
+ if (info)
*info = mono_tramp_info_create ("nullified_class_init_trampoline", buf, code - buf, NULL, NULL);
+ /* It is expected to be a function descriptor on power pre-v2 ABI */
+ buf = mono_create_ftnptr (mono_domain_get (), buf);
+
return buf;
}

View File

@ -1,59 +0,0 @@
From 8f379f0c8f98493180b508b9e68b9aa76c0c5bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@xamarin.com>
Date: Mon, 3 Aug 2015 17:32:31 +0200
Subject: [PATCH] [ppc] Fix atomic_add_i4 support for 32-bit PPC.
---
mono/mini/mini-ppc.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
Index: mono-4.2.1/mono/mini/mini-ppc.c
===================================================================
--- mono-4.2.1.orig/mono/mini/mini-ppc.c
+++ mono-4.2.1/mono/mini/mini-ppc.c
@@ -4417,6 +4417,22 @@ mono_arch_output_basic_block (MonoCompil
else
ppc_mr (code, ins->dreg, ins->sreg1);
break;
+#else
+ case OP_ICONV_TO_R4:
+ case OP_ICONV_TO_R8: {
+ if (cpu_hw_caps & PPC_ISA_64) {
+ ppc_srawi(code, ppc_r0, ins->sreg1, 31);
+ ppc_stw (code, ppc_r0, -8, ppc_r1);
+ ppc_stw (code, ins->sreg1, -4, ppc_r1);
+ ppc_lfd (code, ins->dreg, -8, ppc_r1);
+ ppc_fcfid (code, ins->dreg, ins->dreg);
+ if (ins->opcode == OP_ICONV_TO_R4)
+ ppc_frsp (code, ins->dreg, ins->dreg);
+ }
+ break;
+ }
+#endif
+
case OP_ATOMIC_ADD_I4:
CASE_PPC64 (OP_ATOMIC_ADD_I8) {
int location = ins->inst_basereg;
@@ -4450,21 +4466,6 @@ mono_arch_output_basic_block (MonoCompil
ppc_mr (code, ins->dreg, ppc_r0);
break;
}
-#else
- case OP_ICONV_TO_R4:
- case OP_ICONV_TO_R8: {
- if (cpu_hw_caps & PPC_ISA_64) {
- ppc_srawi(code, ppc_r0, ins->sreg1, 31);
- ppc_stw (code, ppc_r0, -8, ppc_r1);
- ppc_stw (code, ins->sreg1, -4, ppc_r1);
- ppc_lfd (code, ins->dreg, -8, ppc_r1);
- ppc_fcfid (code, ins->dreg, ins->dreg);
- if (ins->opcode == OP_ICONV_TO_R4)
- ppc_frsp (code, ins->dreg, ins->dreg);
- }
- break;
- }
-#endif
case OP_ATOMIC_CAS_I4:
CASE_PPC64 (OP_ATOMIC_CAS_I8) {
int location = ins->sreg1;

View File

@ -1,24 +0,0 @@
From 45c3685e3b360ecc8c5a78ee10c298d6b584a302 Mon Sep 17 00:00:00 2001
From: Bill Seurer <seurer@linux.vnet.ibm.com>
Date: Thu, 10 Sep 2015 13:34:27 -0500
Subject: [PATCH] [ppc] Fix exception when reading from timezone file. See
https://bugzilla.xamarin.com/show_bug.cgi?id=30360
---
mcs/class/corlib/System/TimeZoneInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mono-4.2.1/mcs/class/corlib/System/TimeZoneInfo.cs
===================================================================
--- mono-4.2.1.orig/mcs/class/corlib/System/TimeZoneInfo.cs
+++ mono-4.2.1/mcs/class/corlib/System/TimeZoneInfo.cs
@@ -1175,7 +1175,7 @@ namespace System
return (((i >> 24) & 0xff)
| ((i >> 8) & 0xff00)
| ((i << 8) & 0xff0000)
- | ((i << 24)));
+ | (((i & 0xff) << 24)));
}
static int ReadBigEndianInt32 (byte [] buffer, int start)

File diff suppressed because it is too large Load Diff

View File

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

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

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

View File

@ -0,0 +1,12 @@
diff -uprN mono-4.4.0.old/data/config.in mono-4.4.0.new/data/config.in
--- mono-4.4.0.old/data/config.in 2016-06-09 18:01:54.000000000 +0300
+++ mono-4.4.0.new/data/config.in 2016-03-15 14:31:53.000000000 +0300
@@ -10,7 +10,7 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
- <dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
+ <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>

View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Tue Jun 28 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net
- Update to mono 4.4.1.0, service release 4.4 SR0. Bugfixes since v4.4.0.182:
* bxc#41775 - Zip version needed to extract not correct in System.IO.Compression
* bxc#41782 - [Cycle 7] "System.Net.WebException: Error: NameResolutionFailure" when attempting web requests with certain raw IP addresses
* bxc#41874 - Reflection throws AmbiguousMatchException when calling GetProperty on a class that inherits from a generic base class.
-------------------------------------------------------------------
Sun Jun 12 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net
- Added mono-config-fix-monoposixhelper-libdir.patch to fix incorrect substitution of $mono_libdir (only for libMonoPosixHelper.so) in mono config file:
* Fix incorrect replacement of $mono_libdir in config file for libMonoPosixHelper native library, when system libdir (/usr/lib64 on x86_64 builds) differs from mono install dir (/usr/lib)
-------------------------------------------------------------------
Sat Jun 11 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net
- Update to mono 4.4.0.182, new major release v4.4. Short changelog since v4.2:
* Class Libraries now tracking .NET 4.6.1 APIs, folder structure is updated. Support for older APIs via reference assemblies
* WCF: WebHttpBinding must use http scheme in case when SecurityMode == WebHttpSecurityMode.TransportCredentialOnly
* Embedding API: mini_parse_debug_option allows embedders to set debug options programatically, without going through the MONO_DEBUG environment variable.
* Unmanaged Thin Locks: improved performance for locks and thin locks in some cases, decrease in performance for the case of repetitive nesting of a lock
* libmono now defaults to SGen
* FullAOT: Generic Value Type Sharing improvements
* Cooperative Mode for SGen GC by using MONO_ENABLE_COOP environment variable
* Thread Priority Setting: Implement a SetPriority/GetPriority facility for real-time threads
* Other improvements to garbage collector: concurrent capabilities, lock-free GC handles, performance and memory optimizations
* Profiler: annotate GC roots, so the profiler can get better visibility into the nature of objects that keep objects alive
* Threadpool: no longer using the sparse array for the threadpool, as for many thread it would slow down some operations
* Debugger: the soft debugger now allows nested invocations to take place
* PowerPC: the PowerPC backend has been updated to support big endian systems
* C# Compiler: null operator (?.) has been implemented for dynamic expressions
* Named events and semaphores: the support for sharing named events/semaphores etc. between processes (MONO_ENABLE_SHM) has been removed. Use Mono.Posix instead
* Reflection: major upgrade to Reflection APIs for Roslyn support
* Tools updated: csharp, mdoc, mkbundle, xbuild
More information at: http://www.mono-project.com/docs/about-mono/releases/4.4.0
- Packaging changes:
* spec file updated according to upstream srcrpm
* removed upstreamed patches: mono-nunit-default-runtime-4.5.patch, strncat-process-c.patch, mono-un-revoke-fix-in-BNC-144655.patch
* removed PPC patches: ppc_instruction_length_of_atomic_add_i4_is_28.patch, fix_atomic_add_i4_support_for_32bit_ppc.patch, basic_changes_powerpc_be.patch, ppc_add_monocontext_and_async_callback.patch, fix_passing_struct_parms_per_elf_abiv2.patch, update_elf_abiv2_testcases.patch, partial_sharing_false_4_powerpc.patch, fix_exception_when_reading_from_timezone_file.patch
* fix incorrect requires for libmono-2_0-devel package: it should require libmonosgen-2_0-devel when building with %{sgen} flag enabled, fix broken symlinks to libmonosgen lib
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 2 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net Thu Jun 2 00:00:00 UTC 2016 - fwdsbs.to.11df@xoxy.net

View File

@ -21,42 +21,28 @@
%define sgen yes %define sgen yes
Name: mono-core Name: mono-core
Version: 4.2.3 Version: 4.4.1
Release: 0 Release: 0
Summary: Cross-platform, Open Source, .NET development framework Summary: Cross-platform, Open Source, .NET development framework
License: LGPL-2.1 and MIT and MS-PL License: LGPL-2.1 and MIT and MS-PL
Group: Development/Languages/Mono Group: Development/Languages/Mono
Url: http://www.mono-project.com Url: http://www.mono-project.com
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.4.tar.bz2 Source0: http://download.mono-project.com/sources/mono/mono-%{version}.0.tar.bz2
Source1: mono-core.rpmlintrc Source1: mono-core.rpmlintrc
Source2: gmcs Source2: gmcs
# ppc build segfault so exclude it # ppc build segfault so exclude it
ExcludeArch: ppc ExcludeArch: ppc
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/f3e4d331e7c9e02d25162b01604c0a3c54b23fc0
Patch0: mono-nunit-default-runtime-4.5.patch
# PATCH-FIX-OPENSUSE fix insecure use of strncat at process.c:383 to fix build process
Patch3: strncat-process-c.patch
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/commit/cdb098617af97c6af76e9048af62e8e5e778b5b6)
Patch4: mono-un-revoke-fix-in-BNC-144655.patch
##################
## set of ppc patches from git upstream not yet in tarball 4.2.1
Patch5: ppc_instruction_length_of_atomic_add_i4_is_28.patch
Patch6: fix_atomic_add_i4_support_for_32bit_ppc.patch
Patch7: basic_changes_powerpc_be.patch
Patch8: ppc_add_monocontext_and_async_callback.patch
Patch9: fix_passing_struct_parms_per_elf_abiv2.patch
Patch10: update_elf_abiv2_testcases.patch
Patch11: partial_sharing_false_4_powerpc.patch
Patch12: fix_exception_when_reading_from_timezone_file.patch
##################
# PATCH-FIX-UPSTREAM https://github.com/mono/mono/pull/2394 # PATCH-FIX-UPSTREAM https://github.com/mono/mono/pull/2394
Patch13: libgdiplus0-un-devel.patch Patch13: libgdiplus0-un-devel.patch
# remove checks for libmono in mono-find-provides and mono-find-requires scripts # PATCH-FIX-OPENSUSE remove checks for libmono in mono-find-provides and mono-find-requires scripts
Patch14: find-deps-fix.patch Patch14: find-deps-fix.patch
# PATCH-FIX-OPENSUSE fix incorrect $mono_libdir substitution for libMonoPosixHelper.so library when native library dir (/usr/lib64 on x86_64) is different from mono lib dir (/usr/lib)
Patch15: mono-config-fix-monoposixhelper-libdir.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
BuildRequires: ca-certificates BuildRequires: ca-certificates
BuildRequires: which
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libtool BuildRequires: libtool
@ -87,19 +73,28 @@ Recommends: libmono-llvm0 = %{version}
%endif %endif
Recommends: libgdiplus0 Recommends: libgdiplus0
Provides: mono(Commons.Xml.Relaxng) = 1.0.5000.0 Provides: mono(Commons.Xml.Relaxng) = 1.0.5000.0
Provides: mono(Commons.Xml.Relaxng) = 2.0.0.0
Provides: mono(CustomMarshalers) = 1.0.5000.0 Provides: mono(CustomMarshalers) = 1.0.5000.0
Provides: mono(CustomMarshalers) = 2.0.0.0
Provides: mono(I18N) = 1.0.5000.0 Provides: mono(I18N) = 1.0.5000.0
Provides: mono(I18N) = 2.0.0.0
Provides: mono(I18N.West) = 1.0.5000.0 Provides: mono(I18N.West) = 1.0.5000.0
Provides: mono(I18N.West) = 2.0.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 0.6.0.0 Provides: mono(ICSharpCode.SharpZipLib) = 0.6.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 2.6.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 0.84.0.0 Provides: mono(ICSharpCode.SharpZipLib) = 0.84.0.0
Provides: mono(ICSharpCode.SharpZipLib) = 2.84.0.0
Provides: mono(Mono.Cairo) = 1.0.5000.0 Provides: mono(Mono.Cairo) = 1.0.5000.0
Provides: mono(Mono.Cairo) = 2.0.0.0 Provides: mono(Mono.Cairo) = 2.0.0.0
Provides: mono(Mono.CompilerServices.SymbolWriter) = 1.0.5000.0 Provides: mono(Mono.CompilerServices.SymbolWriter) = 1.0.5000.0
Provides: mono(Mono.CompilerServices.SymbolWriter) = 2.0.0.0
Provides: mono(Mono.Posix) = 1.0.5000.0 Provides: mono(Mono.Posix) = 1.0.5000.0
Provides: mono(Mono.Posix) = 2.0.0.0
Provides: mono(Mono.Security) = 1.0.5000.0 Provides: mono(Mono.Security) = 1.0.5000.0
Provides: mono(Mono.Security) = 2.0.0.0 Provides: mono(Mono.Security) = 2.0.0.0
Provides: mono(System) = 1.0.5000.0 Provides: mono(System) = 1.0.5000.0
Provides: mono(System) = 2.0.0.0 Provides: mono(System) = 2.0.0.0
Provides: mono(System.Configuration) = 1.0.5000.0
Provides: mono(System.Configuration) = 2.0.0.0 Provides: mono(System.Configuration) = 2.0.0.0
Provides: mono(System.Security) = 1.0.5000.0 Provides: mono(System.Security) = 1.0.5000.0
Provides: mono(System.Security) = 2.0.0.0 Provides: mono(System.Security) = 2.0.0.0
@ -174,19 +169,9 @@ technologies that have been submitted to the ECMA for standardization.
%prep %prep
%setup -q -n mono-%{version} %setup -q -n mono-%{version}
%patch0 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%build %build
NOCONFIGURE="yes" ./autogen.sh NOCONFIGURE="yes" ./autogen.sh
@ -251,7 +236,6 @@ rm -f %{buildroot}%{_bindir}/cilc
rm -f %{buildroot}%{_mandir}/man1/cilc.1* rm -f %{buildroot}%{_mandir}/man1/cilc.1*
rm -f %{buildroot}%{_prefix}/lib/mono/*/browsercaps-updater.exe* rm -f %{buildroot}%{_prefix}/lib/mono/*/browsercaps-updater.exe*
rm -f %{buildroot}%{_prefix}/lib/mono/*/culevel.exe* rm -f %{buildroot}%{_prefix}/lib/mono/*/culevel.exe*
rm -f %{buildroot}%{_prefix}/lib/mono/2.0/cilc.exe*
# brp-compress doesn't search _mandir # brp-compress doesn't search _mandir
# so we cheat it # so we cheat it
@ -360,7 +344,6 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/4.5/ICSharpCode.SharpZipLib.dll %{_prefix}/lib/mono/4.5/ICSharpCode.SharpZipLib.dll
%{_prefix}/lib/mono/4.5/Microsoft.CSharp.dll %{_prefix}/lib/mono/4.5/Microsoft.CSharp.dll
%{_prefix}/lib/mono/4.5/Microsoft.VisualC.dll %{_prefix}/lib/mono/4.5/Microsoft.VisualC.dll
%{_prefix}/lib/mono/4.5/Mono.C5.dll
%{_prefix}/lib/mono/4.5/Mono.CSharp.dll %{_prefix}/lib/mono/4.5/Mono.CSharp.dll
%{_prefix}/lib/mono/4.5/Mono.Cairo.dll %{_prefix}/lib/mono/4.5/Mono.Cairo.dll
%{_prefix}/lib/mono/4.5/Mono.CompilerServices.SymbolWriter.dll %{_prefix}/lib/mono/4.5/Mono.CompilerServices.SymbolWriter.dll
@ -368,6 +351,10 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/4.5/Mono.Parallel.dll %{_prefix}/lib/mono/4.5/Mono.Parallel.dll
%{_prefix}/lib/mono/4.5/Mono.Posix.dll %{_prefix}/lib/mono/4.5/Mono.Posix.dll
%{_prefix}/lib/mono/4.5/Mono.Security.dll %{_prefix}/lib/mono/4.5/Mono.Security.dll
%{_prefix}/lib/mono/4.5/Mono.Security.Providers.DotNet.dll
%{_prefix}/lib/mono/4.5/Mono.Security.Providers.NewSystemSource.dll
%{_prefix}/lib/mono/4.5/Mono.Security.Providers.NewTls.dll
%{_prefix}/lib/mono/4.5/Mono.Security.Providers.OldTls.dll
%{_prefix}/lib/mono/4.5/Mono.Simd.dll %{_prefix}/lib/mono/4.5/Mono.Simd.dll
%{_prefix}/lib/mono/4.5/Mono.Tasklets.dll %{_prefix}/lib/mono/4.5/Mono.Tasklets.dll
%{_prefix}/lib/mono/4.5/System.Configuration.dll %{_prefix}/lib/mono/4.5/System.Configuration.dll
@ -381,6 +368,7 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/4.5/System.Net.Http.Formatting.dll %{_prefix}/lib/mono/4.5/System.Net.Http.Formatting.dll
%{_prefix}/lib/mono/4.5/System.Net.Http.WebRequest.dll %{_prefix}/lib/mono/4.5/System.Net.Http.WebRequest.dll
%{_prefix}/lib/mono/4.5/System.Numerics.dll %{_prefix}/lib/mono/4.5/System.Numerics.dll
%{_prefix}/lib/mono/4.5/System.Numerics.Vectors.dll
%{_prefix}/lib/mono/4.5/System.Security.dll %{_prefix}/lib/mono/4.5/System.Security.dll
%{_prefix}/lib/mono/4.5/System.Threading.Tasks.Dataflow.dll %{_prefix}/lib/mono/4.5/System.Threading.Tasks.Dataflow.dll
%{_prefix}/lib/mono/4.5/System.Windows.dll %{_prefix}/lib/mono/4.5/System.Windows.dll
@ -391,6 +379,7 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/4.5/cscompmgd.dll %{_prefix}/lib/mono/4.5/cscompmgd.dll
%{_prefix}/lib/mono/4.5/mscorlib.dll* %{_prefix}/lib/mono/4.5/mscorlib.dll*
%{_prefix}/lib/mono/4.5/Facades/System* %{_prefix}/lib/mono/4.5/Facades/System*
%{_prefix}/lib/mono/4.5/Facades/Microsoft*
%{_prefix}/lib/mono/gac/Commons.Xml.Relaxng %{_prefix}/lib/mono/gac/Commons.Xml.Relaxng
%{_prefix}/lib/mono/gac/CustomMarshalers %{_prefix}/lib/mono/gac/CustomMarshalers
%{_prefix}/lib/mono/gac/I18N %{_prefix}/lib/mono/gac/I18N
@ -398,7 +387,6 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/gac/ICSharpCode.SharpZipLib %{_prefix}/lib/mono/gac/ICSharpCode.SharpZipLib
%{_prefix}/lib/mono/gac/Microsoft.CSharp %{_prefix}/lib/mono/gac/Microsoft.CSharp
%{_prefix}/lib/mono/gac/Microsoft.VisualC %{_prefix}/lib/mono/gac/Microsoft.VisualC
%{_prefix}/lib/mono/gac/Mono.C5
%{_prefix}/lib/mono/gac/Mono.CSharp %{_prefix}/lib/mono/gac/Mono.CSharp
%{_prefix}/lib/mono/gac/Mono.Cairo %{_prefix}/lib/mono/gac/Mono.Cairo
%{_prefix}/lib/mono/gac/Mono.Cecil %{_prefix}/lib/mono/gac/Mono.Cecil
@ -407,6 +395,10 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/gac/Mono.Parallel %{_prefix}/lib/mono/gac/Mono.Parallel
%{_prefix}/lib/mono/gac/Mono.Posix %{_prefix}/lib/mono/gac/Mono.Posix
%{_prefix}/lib/mono/gac/Mono.Security %{_prefix}/lib/mono/gac/Mono.Security
%{_prefix}/lib/mono/gac/Mono.Security.Providers.DotNet
%{_prefix}/lib/mono/gac/Mono.Security.Providers.NewSystemSource
%{_prefix}/lib/mono/gac/Mono.Security.Providers.NewTls
%{_prefix}/lib/mono/gac/Mono.Security.Providers.OldTls
%{_prefix}/lib/mono/gac/Mono.Simd %{_prefix}/lib/mono/gac/Mono.Simd
%{_prefix}/lib/mono/gac/Mono.Tasklets %{_prefix}/lib/mono/gac/Mono.Tasklets
%{_prefix}/lib/mono/gac/System %{_prefix}/lib/mono/gac/System
@ -419,6 +411,7 @@ rm %{buildroot}%{_bindir}/mono-sgen-gdb.py
%{_prefix}/lib/mono/gac/System.Net.Http.Formatting %{_prefix}/lib/mono/gac/System.Net.Http.Formatting
%{_prefix}/lib/mono/gac/System.Net.Http.WebRequest %{_prefix}/lib/mono/gac/System.Net.Http.WebRequest
%{_prefix}/lib/mono/gac/System.Numerics %{_prefix}/lib/mono/gac/System.Numerics
%{_prefix}/lib/mono/gac/System.Numerics.Vectors
%{_prefix}/lib/mono/gac/System.Security %{_prefix}/lib/mono/gac/System.Security
%{_prefix}/lib/mono/gac/System.Threading.Tasks.Dataflow %{_prefix}/lib/mono/gac/System.Threading.Tasks.Dataflow
%{_prefix}/lib/mono/gac/System.Windows %{_prefix}/lib/mono/gac/System.Windows
@ -467,7 +460,11 @@ Summary: Development files for libmono
License: LGPL-2.1 License: LGPL-2.1
Group: Development/Languages/Mono Group: Development/Languages/Mono
Requires: libmono-2_0-1 = %{version} Requires: libmono-2_0-1 = %{version}
%if %{sgen}
Requires: libmonosgen-2_0-devel
%else
Requires: libmonoboehm-2_0-devel Requires: libmonoboehm-2_0-devel
%endif
Requires: mono-core = %{version} Requires: mono-core = %{version}
%description -n libmono-2_0-devel %description -n libmono-2_0-devel
@ -608,9 +605,13 @@ License: LGPL-2.1
Group: Development/Languages/Mono Group: Development/Languages/Mono
Requires: mono-core = %{version} Requires: mono-core = %{version}
Provides: mono(I18N.CJK) = 1.0.5000.0 Provides: mono(I18N.CJK) = 1.0.5000.0
Provides: mono(I18N.CJK) = 2.0.0.0
Provides: mono(I18N.MidEast) = 1.0.5000.0 Provides: mono(I18N.MidEast) = 1.0.5000.0
Provides: mono(I18N.MidEast) = 2.0.0.0
Provides: mono(I18N.Other) = 1.0.5000.0 Provides: mono(I18N.Other) = 1.0.5000.0
Provides: mono(I18N.Other) = 2.0.0.0
Provides: mono(I18N.Rare) = 1.0.5000.0 Provides: mono(I18N.Rare) = 1.0.5000.0
Provides: mono(I18N.Rare) = 2.0.0.0
%description -n mono-locale-extras %description -n mono-locale-extras
The Mono Project is an open development initiative that is working to The Mono Project is an open development initiative that is working to
@ -641,11 +642,15 @@ Provides: mono-directory = %{version}
Provides: mono-ms-enterprise = %{version} Provides: mono-ms-enterprise = %{version}
Provides: mono-novell-directory = %{version} Provides: mono-novell-directory = %{version}
Provides: mono(Mono.Data.Tds) = 1.0.5000.0 Provides: mono(Mono.Data.Tds) = 1.0.5000.0
Provides: mono(Mono.Data.Tds) = 2.0.0.0
Provides: mono(Novell.Directory.Ldap) = 1.0.5000.0 Provides: mono(Novell.Directory.Ldap) = 1.0.5000.0
Provides: mono(Novell.Directory.Ldap) = 2.0.0.0
Provides: mono(System.Data) = 1.0.5000.0 Provides: mono(System.Data) = 1.0.5000.0
Provides: mono(System.Data) = 2.0.0.0 Provides: mono(System.Data) = 2.0.0.0
Provides: mono(System.DirectoryServices) = 1.0.5000.0 Provides: mono(System.DirectoryServices) = 1.0.5000.0
Provides: mono(System.DirectoryServices) = 2.0.0.0
Provides: mono(System.EnterpriseServices) = 1.0.5000.0 Provides: mono(System.EnterpriseServices) = 1.0.5000.0
Provides: mono(System.EnterpriseServices) = 2.0.0.0
%description -n mono-data %description -n mono-data
The Mono Project is an open development initiative that is working to The Mono Project is an open development initiative that is working to
@ -695,10 +700,13 @@ Group: Development/Languages/Mono
Requires: mono-core = %{version} Requires: mono-core = %{version}
Provides: mono-window-forms = %{version} Provides: mono-window-forms = %{version}
Provides: mono(Accessibility) = 1.0.5000.0 Provides: mono(Accessibility) = 1.0.5000.0
Provides: mono(Accessibility) = 2.0.0.0
Provides: mono(System.Design) = 1.0.5000.0 Provides: mono(System.Design) = 1.0.5000.0
Provides: mono(System.Design) = 2.0.0.0
Provides: mono(System.Drawing) = 1.0.5000.0 Provides: mono(System.Drawing) = 1.0.5000.0
Provides: mono(System.Drawing) = 2.0.0.0 Provides: mono(System.Drawing) = 2.0.0.0
Provides: mono(System.Drawing.Design) = 1.0.5000.0 Provides: mono(System.Drawing.Design) = 1.0.5000.0
Provides: mono(System.Drawing.Design) = 2.0.0.0
Provides: mono(System.Windows.Forms) = 1.0.5000.0 Provides: mono(System.Windows.Forms) = 1.0.5000.0
Provides: mono(System.Windows.Forms) = 2.0.0.0 Provides: mono(System.Windows.Forms) = 2.0.0.0
@ -753,13 +761,21 @@ Group: Development/Languages/Mono
Requires: mono-core = %{version} Requires: mono-core = %{version}
Provides: mono-ms-extras = %{version} Provides: mono-ms-extras = %{version}
Provides: mono(Mono.Messaging) = 1.0.5000.0 Provides: mono(Mono.Messaging) = 1.0.5000.0
Provides: mono(Mono.Messaging) = 2.0.0.0
Provides: mono(Mono.Messaging.RabbitMQ) = 1.0.5000.0 Provides: mono(Mono.Messaging.RabbitMQ) = 1.0.5000.0
Provides: mono(Mono.Messaging.RabbitMQ) = 2.0.0.0
Provides: mono(RabbitMQ.Client) = 1.0.5000.0 Provides: mono(RabbitMQ.Client) = 1.0.5000.0
Provides: mono(RabbitMQ.Client) = 2.0.0.0
Provides: mono(System.Configuration.Install) = 1.0.5000.0 Provides: mono(System.Configuration.Install) = 1.0.5000.0
Provides: mono(System.Configuration.Install) = 2.0.0.0
Provides: mono(System.Management) = 1.0.5000.0 Provides: mono(System.Management) = 1.0.5000.0
Provides: mono(System.Management) = 2.0.0.0
Provides: mono(System.Messaging) = 1.0.5000.0 Provides: mono(System.Messaging) = 1.0.5000.0
Provides: mono(System.Messaging) = 2.0.0.0
Provides: mono(System.ServiceProcess) = 1.0.5000.0 Provides: mono(System.ServiceProcess) = 1.0.5000.0
Provides: mono(System.ServiceProcess) = 2.0.0.0
Provides: mono(mono-service) = 1.0.5000.0 Provides: mono(mono-service) = 1.0.5000.0
Provides: mono(mono-service) = 2.0.0.0
%description -n mono-extras %description -n mono-extras
The Mono Project is an open development initiative that is working to The Mono Project is an open development initiative that is working to
@ -805,6 +821,7 @@ Group: Development/Languages/Mono
Requires: mono-core = %{version} Requires: mono-core = %{version}
Requires: mono-data = %{version} Requires: mono-data = %{version}
Provides: mono(Mono.Data.Sqlite) = 1.0.5000.0 Provides: mono(Mono.Data.Sqlite) = 1.0.5000.0
Provides: mono(Mono.Data.Sqlite) = 2.0.0.0
%description -n mono-data-sqlite %description -n mono-data-sqlite
The Mono Project is an open development initiative that is working to The Mono Project is an open development initiative that is working to
@ -845,9 +862,9 @@ Mono implementation of WCF, Windows Communication Foundation
%{_prefix}/lib/mono/4.5/System.Runtime.DurableInstancing.dll %{_prefix}/lib/mono/4.5/System.Runtime.DurableInstancing.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.Activation.dll %{_prefix}/lib/mono/4.5/System.ServiceModel.Activation.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.Discovery.dll %{_prefix}/lib/mono/4.5/System.ServiceModel.Discovery.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.Internals.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.Routing.dll %{_prefix}/lib/mono/4.5/System.ServiceModel.Routing.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.Web.dll %{_prefix}/lib/mono/4.5/System.ServiceModel.Web.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.Internals.dll
%{_prefix}/lib/mono/4.5/System.ServiceModel.dll %{_prefix}/lib/mono/4.5/System.ServiceModel.dll
%{_prefix}/lib/mono/4.5/SMDiagnostics.dll %{_prefix}/lib/mono/4.5/SMDiagnostics.dll
%{_prefix}/lib/mono/4.5/svcutil.exe* %{_prefix}/lib/mono/4.5/svcutil.exe*
@ -855,13 +872,13 @@ Mono implementation of WCF, Windows Communication Foundation
%{_prefix}/lib/mono/gac/System.IdentityModel %{_prefix}/lib/mono/gac/System.IdentityModel
%{_prefix}/lib/mono/gac/System.IdentityModel.Selectors %{_prefix}/lib/mono/gac/System.IdentityModel.Selectors
%{_prefix}/lib/mono/gac/System.Runtime.DurableInstancing %{_prefix}/lib/mono/gac/System.Runtime.DurableInstancing
%{_prefix}/lib/mono/gac/SMDiagnostics
%{_prefix}/lib/mono/gac/System.ServiceModel %{_prefix}/lib/mono/gac/System.ServiceModel
%{_prefix}/lib/mono/gac/System.ServiceModel.Internals
%{_prefix}/lib/mono/gac/System.ServiceModel.Activation %{_prefix}/lib/mono/gac/System.ServiceModel.Activation
%{_prefix}/lib/mono/gac/System.ServiceModel.Discovery %{_prefix}/lib/mono/gac/System.ServiceModel.Discovery
%{_prefix}/lib/mono/gac/System.ServiceModel.Internals
%{_prefix}/lib/mono/gac/System.ServiceModel.Routing %{_prefix}/lib/mono/gac/System.ServiceModel.Routing
%{_prefix}/lib/mono/gac/System.ServiceModel.Web %{_prefix}/lib/mono/gac/System.ServiceModel.Web
%{_prefix}/lib/mono/gac/SMDiagnostics
%package -n mono-winfxcore %package -n mono-winfxcore
Summary: Mono implementation of core WinFX APIs Summary: Mono implementation of core WinFX APIs
@ -894,12 +911,16 @@ Provides: mono-remoting = %{version}
Provides: mono-web-forms = %{version} Provides: mono-web-forms = %{version}
Provides: mono-web-services = %{version} Provides: mono-web-services = %{version}
Provides: mono(Mono.Http) = 1.0.5000.0 Provides: mono(Mono.Http) = 1.0.5000.0
Provides: mono(Mono.Http) = 2.0.0.0
Provides: mono(System.Runtime.Remoting) = 1.0.5000.0 Provides: mono(System.Runtime.Remoting) = 1.0.5000.0
Provides: mono(System.Runtime.Remoting) = 2.0.0.0 Provides: mono(System.Runtime.Remoting) = 2.0.0.0
Provides: mono(System.Runtime.Serialization.Formatters.Soap) = 1.0.5000.0 Provides: mono(System.Runtime.Serialization.Formatters.Soap) = 1.0.5000.0
Provides: mono(System.Runtime.Serialization.Formatters.Soap) = 2.0.0.0
Provides: mono(System.Web) = 1.0.5000.0 Provides: mono(System.Web) = 1.0.5000.0
Provides: mono(System.Web) = 2.0.0.0
Provides: mono(System.Web.Razor) = 2.0.0.0 Provides: mono(System.Web.Razor) = 2.0.0.0
Provides: mono(System.Web.Services) = 1.0.5000.0 Provides: mono(System.Web.Services) = 1.0.5000.0
Provides: mono(System.Web.Services) = 2.0.0.0
Provides: mono(System.Web.WebPages.Deployment) = 2.1.0.0 Provides: mono(System.Web.WebPages.Deployment) = 2.1.0.0
Provides: mono(System.Web.WebPages.Razor) = 2.0.0.0 Provides: mono(System.Web.WebPages.Razor) = 2.0.0.0
@ -1018,6 +1039,7 @@ Group: Development/Languages/Mono
Requires: mono-core = %{version} Requires: mono-core = %{version}
Requires: mono-data = %{version} Requires: mono-data = %{version}
Provides: mono(System.Data.OracleClient) = 1.0.5000.0 Provides: mono(System.Data.OracleClient) = 1.0.5000.0
Provides: mono(System.Data.OracleClient) = 2.0.0.0
%description -n mono-data-oracle %description -n mono-data-oracle
The Mono Project is an open development initiative that is working to The Mono Project is an open development initiative that is working to
@ -1092,7 +1114,9 @@ Provides: mono-xbuild = %{version}
Provides: mono-biarchcompat = %{version} Provides: mono-biarchcompat = %{version}
%endif %endif
Provides: mono(PEAPI) = 1.0.5000.0 Provides: mono(PEAPI) = 1.0.5000.0
Provides: mono(PEAPI) = 2.0.0.0
Provides: mono(resgen) = 1.0.5000.0 Provides: mono(resgen) = 1.0.5000.0
Provides: mono(resgen) = 2.0.0.0
#following 5 lines needed for a temporary build fix. According to https://github.com/mono/mono/commit/1f4133a06f252ec1b78637dd91e49f50836cf570, we shoud fix individual packages that rely on incorrect dependencies #following 5 lines needed for a temporary build fix. According to https://github.com/mono/mono/commit/1f4133a06f252ec1b78637dd91e49f50836cf570, we shoud fix individual packages that rely on incorrect dependencies
Provides: mono(System.ServiceModel) = 3.0.0.0 Provides: mono(System.ServiceModel) = 3.0.0.0
Provides: mono(System.Core) = 3.5.0.0 Provides: mono(System.Core) = 3.5.0.0
@ -1199,8 +1223,10 @@ Mono development tools.
%{_mandir}/man1/xbuild.1%ext_man %{_mandir}/man1/xbuild.1%ext_man
%{_prefix}/lib/mono-source-libs %{_prefix}/lib/mono-source-libs
%{_prefix}/lib/mono/4.0 %{_prefix}/lib/mono/4.0
%{_prefix}/lib/mono/3.5 %{_prefix}/lib/mono/4.5-api
%{_prefix}/lib/mono/2.0 %{_prefix}/lib/mono/4.0-api
%{_prefix}/lib/mono/3.5-api
%{_prefix}/lib/mono/2.0-api
%{_prefix}/lib/mono/4.5/Microsoft.Build.dll %{_prefix}/lib/mono/4.5/Microsoft.Build.dll
%{_prefix}/lib/mono/4.5/Microsoft.Build.Engine.dll %{_prefix}/lib/mono/4.5/Microsoft.Build.Engine.dll
%{_prefix}/lib/mono/4.5/Microsoft.Build.Framework.dll %{_prefix}/lib/mono/4.5/Microsoft.Build.Framework.dll
@ -1221,6 +1247,7 @@ Mono development tools.
%{_prefix}/lib/mono/4.5/ilasm.exe* %{_prefix}/lib/mono/4.5/ilasm.exe*
%{_prefix}/lib/mono/4.5/installvst.exe* %{_prefix}/lib/mono/4.5/installvst.exe*
%{_prefix}/lib/mono/4.5/lc.exe* %{_prefix}/lib/mono/4.5/lc.exe*
%{_prefix}/lib/mono/4.5/linkeranalyzer.exe*
%{_prefix}/lib/mono/4.5/macpack.exe* %{_prefix}/lib/mono/4.5/macpack.exe*
%{_prefix}/lib/mono/4.5/makecert.exe* %{_prefix}/lib/mono/4.5/makecert.exe*
%{_prefix}/lib/mono/4.5/mdbrebase.exe* %{_prefix}/lib/mono/4.5/mdbrebase.exe*
@ -1228,7 +1255,6 @@ Mono development tools.
%{_prefix}/lib/mono/4.5/mono-api-info.exe* %{_prefix}/lib/mono/4.5/mono-api-info.exe*
%{_prefix}/lib/mono/4.5/mono-cil-strip.exe* %{_prefix}/lib/mono/4.5/mono-cil-strip.exe*
%{_prefix}/lib/mono/4.5/mono-shlib-cop.exe* %{_prefix}/lib/mono/4.5/mono-shlib-cop.exe*
%{_prefix}/lib/mono/4.5/mono-symbolicate.exe*
%{_prefix}/lib/mono/4.5/mono-xmltool.exe* %{_prefix}/lib/mono/4.5/mono-xmltool.exe*
%{_prefix}/lib/mono/4.5/monolinker.* %{_prefix}/lib/mono/4.5/monolinker.*
%{_prefix}/lib/mono/4.5/monop.exe* %{_prefix}/lib/mono/4.5/monop.exe*
@ -1238,6 +1264,7 @@ Mono development tools.
%{_prefix}/lib/mono/4.5/secutil.exe* %{_prefix}/lib/mono/4.5/secutil.exe*
%{_prefix}/lib/mono/4.5/sgen.exe* %{_prefix}/lib/mono/4.5/sgen.exe*
%{_prefix}/lib/mono/4.5/signcode.exe* %{_prefix}/lib/mono/4.5/signcode.exe*
%{_prefix}/lib/mono/4.5/*symbolicate.exe*
%{_prefix}/lib/mono/4.5/xbuild.exe* %{_prefix}/lib/mono/4.5/xbuild.exe*
%{_prefix}/lib/mono/4.5/xbuild.rsp %{_prefix}/lib/mono/4.5/xbuild.rsp
%{_prefix}/lib/mono/4.5/MSBuild/ %{_prefix}/lib/mono/4.5/MSBuild/

View File

@ -1,10 +0,0 @@
Index: mono-3.10.0/data/mono-nunit.pc.in
===================================================================
--- mono-3.10.0.orig/data/mono-nunit.pc.in
+++ mono-3.10.0/data/mono-nunit.pc.in
@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
Name: Mono NUnit
Description: Mono's version of NUnit
Version: @VERSION@
-Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll
+Libs: -r:${libdir}/mono/4.5/nunit.core.dll -r:${libdir}/mono/4.5/nunit.core.interfaces.dll -r:${libdir}/mono/4.5/nunit.core.extensions.dll -r:${libdir}/mono/4.5/nunit.framework.dll -r:${libdir}/mono/4.5/nunit.framework.extensions.dll -r:${libdir}/mono/4.5/nunit.mocks.dll -r:${libdir}/mono/4.5/nunit.util.dll -r:${libdir}/mono/4.5/nunit-console-runner.dll

View File

@ -1,28 +0,0 @@
From cdb098617af97c6af76e9048af62e8e5e778b5b6 Mon Sep 17 00:00:00 2001
From: Jo Shields <jo.shields@xamarin.com>
Date: Tue, 11 Aug 2015 19:41:23 +0100
Subject: [PATCH] Un-revoke fix in BNC#144655 - mono-find-provides should ONLY
work on GAC libraries, and any packages which break on this behaviour should
be fixed - rather than generating utterly broken Provides.
(cherry picked from commit 1f4133a06f252ec1b78637dd91e49f50836cf570)
---
scripts/mono-find-provides.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index 155690d..5e440ab 100644
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -14,7 +14,7 @@ monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
# Only include files with /gac/ in path
# (Allows packages to contain private assemblies that don't conflict with other packages)
-#monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
+monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/"))
# Disabled... see ChangeLog
# Set the prefix, unless it is overriden (used when building mono rpms)
--
2.6.0

View File

@ -1,24 +0,0 @@
From 35b511524a4d15b75cfbba982d82b7abef3a29dc Mon Sep 17 00:00:00 2001
From: Bill Seurer <seurer@linux.vnet.ibm.com>
Date: Tue, 8 Dec 2015 12:52:01 -0600
Subject: [PATCH] [ppc] Temporary fix for power to get builds working.
---
mono/mini/mini-ppc.c | 3 +++
1 file changed, 3 insertions(+)
Index: mono-4.2.1/mono/mini/mini-ppc.c
===================================================================
--- mono-4.2.1.orig/mono/mini/mini-ppc.c
+++ mono-4.2.1/mono/mini/mini-ppc.c
@@ -627,6 +627,9 @@ mono_arch_init (void)
mono_mprotect (bp_trigger_page, mono_pagesize (), 0);
mono_aot_register_jit_icall ("mono_ppc_throw_exception", mono_ppc_throw_exception);
+
+ // FIXME: Fix partial sharing for power and remove this
+ mono_set_partial_sharing_supported (FALSE);
}
/*

View File

@ -1,168 +0,0 @@
From f05362d9a16317c65cf46506b7557dfb0176a678 Mon Sep 17 00:00:00 2001
From: Bill Seurer <seurer@linux.vnet.ibm.com>
Date: Mon, 24 Aug 2015 17:10:36 -0500
Subject: [PATCH] [ppc] Add MonoContext and asynch callback support
---
mono/mini/exceptions-ppc.c | 13 ++++++
mono/mini/mini-ppc.h | 11 ++++-
mono/utils/mono-context.h | 95 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 117 insertions(+), 2 deletions(-)
Index: mono-4.2.1/mono/mini/exceptions-ppc.c
===================================================================
--- mono-4.2.1.orig/mono/mini/exceptions-ppc.c
+++ mono-4.2.1/mono/mini/exceptions-ppc.c
@@ -783,3 +783,16 @@ mono_arch_handle_exception (void *ctx, g
return result;
#endif
}
+
+
+// FIX ME: This is not complete
+void
+mono_arch_setup_async_callback (MonoContext *ctx, void (*async_cb)(void *fun), gpointer user_data)
+{
+ uintptr_t sp = (uintptr_t) MONO_CONTEXT_GET_SP(ctx);
+ sp -= PPC_MINIMAL_STACK_SIZE;
+ *(unsigned long *)sp = MONO_CONTEXT_GET_SP(ctx);
+ MONO_CONTEXT_SET_BP(ctx, sp);
+ MONO_CONTEXT_SET_IP(ctx, (unsigned long) async_cb);
+}
+
Index: mono-4.2.1/mono/mini/mini-ppc.h
===================================================================
--- mono-4.2.1.orig/mono/mini/mini-ppc.h
+++ mono-4.2.1/mono/mini/mini-ppc.h
@@ -139,8 +139,15 @@ typedef struct MonoCompileArch {
/* Linux */
#ifdef __mono_ppc64__
#define PPC_RET_ADDR_OFFSET 16
-#define PPC_STACK_PARAM_OFFSET 48
-#define PPC_MINIMAL_STACK_SIZE 48
+ // Power LE abvi2
+ #if (_CALL_ELF == 2)
+ #define PPC_STACK_PARAM_OFFSET 32
+ #define PPC_MINIMAL_STACK_SIZE 32
+ #else
+ #define PPC_STACK_PARAM_OFFSET 48
+ #define PPC_MINIMAL_STACK_SIZE 48
+ #endif
+#define MONO_ARCH_HAVE_SETUP_ASYNC_CALLBACK 1
#define PPC_MINIMAL_PARAM_AREA_SIZE 64
#define PPC_LAST_FPARG_REG ppc_f13
#define PPC_PASS_STRUCTS_BY_VALUE 1
Index: mono-4.2.1/mono/utils/mono-context.h
===================================================================
--- mono-4.2.1.orig/mono/utils/mono-context.h
+++ mono-4.2.1/mono/utils/mono-context.h
@@ -359,6 +359,100 @@ typedef struct {
* We might also want to add an additional field to propagate
* the original context from the signal handler.
*/
+#ifdef __mono_ppc64__
+
+typedef struct {
+ gulong sc_ir; // pc
+ gulong sc_sp; // r1
+ mgreg_t regs [32];
+ double fregs [32];
+} MonoContext;
+
+/* we have the stack pointer, not the base pointer in sigcontext */
+#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->sc_ir = (gulong)ip; } while (0);
+#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->sc_sp = (gulong)bp; } while (0);
+#define MONO_CONTEXT_SET_SP(ctx,sp) do { (ctx)->sc_sp = (gulong)sp; } while (0);
+
+#define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->sc_ir))
+#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ppc_r31-13]))
+#define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->sc_sp))
+
+#define MONO_CONTEXT_GET_CURRENT(ctx) \
+ __asm__ __volatile__( \
+ "std 0, 0(%0)\n" \
+ "std 1, 8(%0)\n" \
+ "std 0, 8*0+16(%0)\n" \
+ "std 1, 8*1+16(%0)\n" \
+ "std 2, 8*2+16(%0)\n" \
+ "std 3, 8*3+16(%0)\n" \
+ "std 4, 8*4+16(%0)\n" \
+ "std 5, 8*5+16(%0)\n" \
+ "std 6, 8*6+16(%0)\n" \
+ "std 7, 8*7+16(%0)\n" \
+ "std 8, 8*8+16(%0)\n" \
+ "std 9, 8*9+16(%0)\n" \
+ "std 10, 8*10+16(%0)\n" \
+ "std 11, 8*11+16(%0)\n" \
+ "std 12, 8*12+16(%0)\n" \
+ "std 13, 8*13+16(%0)\n" \
+ "std 14, 8*14+16(%0)\n" \
+ "std 15, 8*15+16(%0)\n" \
+ "std 16, 8*16+16(%0)\n" \
+ "std 17, 8*17+16(%0)\n" \
+ "std 18, 8*18+16(%0)\n" \
+ "std 19, 8*19+16(%0)\n" \
+ "std 20, 8*20+16(%0)\n" \
+ "std 21, 8*21+16(%0)\n" \
+ "std 22, 8*22+16(%0)\n" \
+ "std 23, 8*23+16(%0)\n" \
+ "std 24, 8*24+16(%0)\n" \
+ "std 25, 8*25+16(%0)\n" \
+ "std 26, 8*26+16(%0)\n" \
+ "std 27, 8*27+16(%0)\n" \
+ "std 28, 8*28+16(%0)\n" \
+ "std 29, 8*29+16(%0)\n" \
+ "std 30, 8*30+16(%0)\n" \
+ "std 31, 8*31+16(%0)\n" \
+ "stfd 0, 8*0+8*32+16(%0)\n" \
+ "stfd 1, 8*1+8*32+16(%0)\n" \
+ "stfd 2, 8*2+8*32+16(%0)\n" \
+ "stfd 3, 8*3+8*32+16(%0)\n" \
+ "stfd 4, 8*4+8*32+16(%0)\n" \
+ "stfd 5, 8*5+8*32+16(%0)\n" \
+ "stfd 6, 8*6+8*32+16(%0)\n" \
+ "stfd 7, 8*7+8*32+16(%0)\n" \
+ "stfd 8, 8*8+8*32+16(%0)\n" \
+ "stfd 9, 8*9+8*32+16(%0)\n" \
+ "stfd 10, 8*10+8*32+16(%0)\n" \
+ "stfd 11, 8*11+8*32+16(%0)\n" \
+ "stfd 12, 8*12+8*32+16(%0)\n" \
+ "stfd 13, 8*13+8*32+16(%0)\n" \
+ "stfd 14, 8*14+8*32+16(%0)\n" \
+ "stfd 15, 8*15+8*32+16(%0)\n" \
+ "stfd 16, 8*16+8*32+16(%0)\n" \
+ "stfd 17, 8*17+8*32+16(%0)\n" \
+ "stfd 18, 8*18+8*32+16(%0)\n" \
+ "stfd 19, 8*19+8*32+16(%0)\n" \
+ "stfd 20, 8*20+8*32+16(%0)\n" \
+ "stfd 21, 8*21+8*32+16(%0)\n" \
+ "stfd 22, 8*22+8*32+16(%0)\n" \
+ "stfd 23, 8*23+8*32+16(%0)\n" \
+ "stfd 24, 8*24+8*32+16(%0)\n" \
+ "stfd 25, 8*25+8*32+16(%0)\n" \
+ "stfd 26, 8*26+8*32+16(%0)\n" \
+ "stfd 27, 8*27+8*32+16(%0)\n" \
+ "stfd 28, 8*28+8*32+16(%0)\n" \
+ "stfd 29, 8*29+8*32+16(%0)\n" \
+ "stfd 30, 8*30+8*32+16(%0)\n" \
+ "stfd 31, 8*31+8*32+16(%0)\n" \
+ : : "r" (&(ctx)) \
+ : "memory" \
+ )
+
+#define MONO_ARCH_HAS_MONO_CONTEXT 1
+
+#else
+
typedef struct {
gulong sc_ir; // pc
gulong sc_sp; // r1
@@ -375,6 +469,7 @@ typedef struct {
#define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->sc_ir))
#define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->regs [ppc_r31-13]))
#define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->sc_sp))
+#endif
#elif defined(__sparc__) || defined(sparc) /* defined(__mono_ppc__) */

View File

@ -1,21 +0,0 @@
From f967c79926900343f399c75624deedaba460e544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@xamarin.com>
Date: Mon, 3 Aug 2015 17:32:07 +0200
Subject: [PATCH] [ppc] Instruction length of atomic_add_i4 is 28.
---
mono/mini/cpu-ppc.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mono-4.2.1/mono/mini/cpu-ppc.md
===================================================================
--- mono-4.2.1.orig/mono/mini/cpu-ppc.md
+++ mono-4.2.1/mono/mini/cpu-ppc.md
@@ -314,5 +314,5 @@ vcall2_membase: src1:b len:16 clob:c
jump_table: dest:i len:8
-atomic_add_i4: src1:b src2:i dest:i len:20
+atomic_add_i4: src1:b src2:i dest:i len:28
atomic_cas_i4: src1:b src2:i src3:i dest:i len:38

View File

@ -1,12 +0,0 @@
diff -uprN mono-4.2.0.old/mono/metadata/process.c mono-4.2.0.new/mono/metadata/process.c
--- mono-4.2.0.old/mono/metadata/process.c 2015-08-26 12:42:25.000000000 +0300
+++ mono-4.2.0.new/mono/metadata/process.c 2015-08-29 15:49:25.369632846 +0300
@@ -380,7 +380,7 @@ static MonoObject* get_process_module (M
char filename [80] = "[In Memory] ";
const char *modulename = assembly->aname.name;
- strncat (filename, modulename, 80);
+ strncat (filename, modulename, sizeof(filename)-strlen(filename)-1);
/* Build a System.Diagnostics.ProcessModule with the data.
*/

File diff suppressed because it is too large Load Diff