forked from pool/mono-core
Accepting request 809122 from home:mgorse:branches:Mono:Factory
Merge pending SRs (version update + aarch64 fixes), and fix s390x build OBS-URL: https://build.opensuse.org/request/show/809122 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=209
This commit is contained in:
parent
af0d872e9e
commit
0fa0c85537
7
_constraints
Normal file
7
_constraints
Normal file
@ -0,0 +1,7 @@
|
||||
<constraints>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">6</size>
|
||||
</disk>
|
||||
</hardware>
|
||||
</constraints>
|
12
fix-s390x-ucontext.patch
Normal file
12
fix-s390x-ucontext.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -urp mono-6.8.0.123.orig/mono/utils/mono-context.h mono-6.8.0.123/mono/utils/mono-context.h
|
||||
--- mono-6.8.0.123.orig/mono/utils/mono-context.h 2020-05-11 12:58:14.000000000 -0500
|
||||
+++ mono-6.8.0.123/mono/utils/mono-context.h 2020-05-21 15:10:03.209484526 -0500
|
||||
@@ -879,7 +879,7 @@ typedef struct {
|
||||
|
||||
#include <sys/ucontext.h>
|
||||
|
||||
-#if __GLIBC_PREREQ(2, 27)
|
||||
+#if __GLIBC_PREREQ(2, 26)
|
||||
typedef ucontext_t MonoContext;
|
||||
#else
|
||||
typedef struct ucontext MonoContext;
|
3
mono-6.8.0.105.tar.xz
Normal file
3
mono-6.8.0.105.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:578799c44c3c86a9eb5daf6dec6c60a24341940fd376371956d4a46cf8612178
|
||||
size 243441900
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ed5df4ec663a4e228e89e910e954fa18d33f72e790c11174e1b62fc8cca90ba0
|
||||
size 245059192
|
@ -1,8 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 29 10:05:31 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
Tue May 26 19:57:47 UTC 2020 - Michael Gorse <mgorse@suse.com>
|
||||
|
||||
- Add mono.attr and install it to %_rpmconfigdir/fileattrs: enable
|
||||
the dependency scanner for rpm packages (boo#1152775).
|
||||
- Add fix-s390x-ucontext.patch: fix the build on 15.2/s390x
|
||||
(bsc#1171934).
|
||||
- Add _constraints to prevent running out of disk space.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 24 08:07:07 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Enable roslyn on aarch64 to build additionnal tools (mdoc.exe, ...)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 21 19:10:16 UTC 2020 - David Mulder <dmulder@suse.com>
|
||||
|
||||
- Update to the most current mono release, 6.8.0.105.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 19 07:44:57 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
@ -33,13 +33,13 @@
|
||||
%define btls no
|
||||
%endif
|
||||
|
||||
%ifarch %ix86 x86_64 %{arm}
|
||||
%ifarch %ix86 x86_64 %{arm} aarch64
|
||||
%define roslyn yes
|
||||
%else
|
||||
%define roslyn no
|
||||
%endif
|
||||
|
||||
%define version_suffix 96
|
||||
%define version_suffix 105
|
||||
|
||||
Name: mono-core
|
||||
Version: 6.8.0
|
||||
@ -64,6 +64,8 @@ Patch16: fix-dbg-headers.patch
|
||||
Patch20: xbuild-use-roslyn-vbc.patch
|
||||
# PATCH-FIX-OPENSUSE fix 64bit-portability-issue at exceptions-ppc.c:799
|
||||
Patch21: fix-ppc-64bit-portability-issue.patch
|
||||
# PATCH-FIX-UPSTREAM fix-s390x-ucontext.patch bsc#1171934 mgorse@suse.com -- fix s390x build on glibc 2.26.
|
||||
Patch22: fix-s390x-ucontext.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
@ -213,6 +215,7 @@ technologies that have been submitted to the ECMA for standardization.
|
||||
%patch20 -p1
|
||||
%endif
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
|
||||
%build
|
||||
%define _lto_cflags %{nil}
|
||||
@ -1275,7 +1278,7 @@ Mono development tools.
|
||||
%defattr(-, root, root)
|
||||
%{_bindir}/aprofutil
|
||||
%{_prefix}/lib/mono/4.5/aprofutil.exe
|
||||
%ifnarch aarch64 ppc64 ppc64le
|
||||
%ifnarch ppc64 ppc64le s390x
|
||||
%{_prefix}/lib/mono/4.5/aprofutil.pdb
|
||||
%else
|
||||
%{_prefix}/lib/mono/4.5/aprofutil.exe.mdb
|
||||
@ -1418,7 +1421,7 @@ Mono development tools.
|
||||
%{_prefix}/lib/mono/4.5/mono-cil-strip.exe*
|
||||
%{_prefix}/lib/mono/4.5/mono-shlib-cop.exe*
|
||||
%{_prefix}/lib/mono/4.5/mono-xmltool.exe*
|
||||
%ifnarch aarch64 ppc64 ppc64le
|
||||
%ifnarch ppc64 ppc64le s390x
|
||||
%{_prefix}/lib/mono/4.5/monolinker.*
|
||||
%endif
|
||||
%{_prefix}/lib/mono/4.5/monop.exe*
|
||||
@ -1571,7 +1574,7 @@ Monodoc-core contains documentation tools for C#.
|
||||
%{_mandir}/man1/monodocer.1%ext_man
|
||||
%{_mandir}/man1/monodocs2html.1%ext_man
|
||||
%{_mandir}/man5/mdoc.5%ext_man
|
||||
%ifnarch aarch64 ppc64 ppc64le
|
||||
%ifnarch ppc64 ppc64le s390x
|
||||
%{_prefix}/lib/mono/4.5/mdoc.exe*
|
||||
%endif
|
||||
%{_prefix}/lib/mono/4.5/mod.exe*
|
||||
|
Loading…
Reference in New Issue
Block a user