From 0fa0c855373522d1a71f579f039ab3b63459a4b8e3eb143df70b33e98e0dd467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 27 May 2020 04:43:04 +0000 Subject: [PATCH 1/5] 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 --- _constraints | 7 +++++++ fix-s390x-ucontext.patch | 12 ++++++++++++ mono-6.8.0.105.tar.xz | 3 +++ mono-6.8.0.96.tar.xz | 3 --- mono-core.changes | 17 ++++++++++++++--- mono-core.spec | 13 ++++++++----- 6 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 _constraints create mode 100644 fix-s390x-ucontext.patch create mode 100644 mono-6.8.0.105.tar.xz delete mode 100644 mono-6.8.0.96.tar.xz diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..4a37606 --- /dev/null +++ b/_constraints @@ -0,0 +1,7 @@ + + + + 6 + + + diff --git a/fix-s390x-ucontext.patch b/fix-s390x-ucontext.patch new file mode 100644 index 0000000..4ad99e4 --- /dev/null +++ b/fix-s390x-ucontext.patch @@ -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 + +-#if __GLIBC_PREREQ(2, 27) ++#if __GLIBC_PREREQ(2, 26) + typedef ucontext_t MonoContext; + #else + typedef struct ucontext MonoContext; diff --git a/mono-6.8.0.105.tar.xz b/mono-6.8.0.105.tar.xz new file mode 100644 index 0000000..1b16651 --- /dev/null +++ b/mono-6.8.0.105.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:578799c44c3c86a9eb5daf6dec6c60a24341940fd376371956d4a46cf8612178 +size 243441900 diff --git a/mono-6.8.0.96.tar.xz b/mono-6.8.0.96.tar.xz deleted file mode 100644 index 1190dd5..0000000 --- a/mono-6.8.0.96.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed5df4ec663a4e228e89e910e954fa18d33f72e790c11174e1b62fc8cca90ba0 -size 245059192 diff --git a/mono-core.changes b/mono-core.changes index 275f25f..d7944a9 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,8 +1,19 @@ ------------------------------------------------------------------- -Wed Apr 29 10:05:31 UTC 2020 - Dominique Leuenberger +Tue May 26 19:57:47 UTC 2020 - Michael Gorse -- 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 + +- Enable roslyn on aarch64 to build additionnal tools (mdoc.exe, ...) + +------------------------------------------------------------------- +Tue Apr 21 19:10:16 UTC 2020 - David Mulder + +- Update to the most current mono release, 6.8.0.105. ------------------------------------------------------------------- Thu Mar 19 07:44:57 UTC 2020 - Guillaume GARDET diff --git a/mono-core.spec b/mono-core.spec index ca76a29..eb8576f 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -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* From ddb59c9174e48f85ddf114d4990a40eba1dda630dd90064d6e2ac82d9ae49b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 27 May 2020 04:44:50 +0000 Subject: [PATCH 2/5] Fixup OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=210 --- mono-core.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mono-core.changes b/mono-core.changes index d7944a9..96d2449 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -10,6 +10,12 @@ Sun May 24 08:07:07 UTC 2020 - Guillaume GARDET - Enable roslyn on aarch64 to build additionnal tools (mdoc.exe, ...) +------------------------------------------------------------------- +Wed Apr 29 10:05:31 UTC 2020 - Dominique Leuenberger + +- Add mono.attr and install it to %_rpmconfigdir/fileattrs: enable + the dependency scanner for rpm packages (boo#1152775). + ------------------------------------------------------------------- Tue Apr 21 19:10:16 UTC 2020 - David Mulder From e8624b5d06be2ae06c96514b3c9b118f3f834f7ba0707a1e83ab2d2fb3a6972b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 27 May 2020 09:35:59 +0000 Subject: [PATCH 3/5] - Add mono-find-provides and mono-find-requires from Fedora and use it instead. Fixes boo#1152775 OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=211 --- mono-core.changes | 6 ++++ mono-core.spec | 8 +++++ mono-find-provides | 42 ++++++++++++++++++++++ mono-find-requires | 86 ++++++++++++++++++++++++++++++++++++++++++++++ mono.attr | 4 +-- 5 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 mono-find-provides create mode 100644 mono-find-requires diff --git a/mono-core.changes b/mono-core.changes index 96d2449..45b5330 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 27 09:35:05 UTC 2020 - Ismail Dönmez + +- Add mono-find-provides and mono-find-requires from Fedora and use + it instead. Fixes boo#1152775 + ------------------------------------------------------------------- Tue May 26 19:57:47 UTC 2020 - Michael Gorse diff --git a/mono-core.spec b/mono-core.spec index eb8576f..0c95598 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -52,6 +52,8 @@ Source0: http://download.mono-project.com/sources/mono/mono-%{version}.%{ Source1: mono-core.rpmlintrc Source2: gmcs Source3: mono.attr +Source4: mono-find-provides +Source5: mono-find-requires # ppc build segfault so exclude it ExcludeArch: ppc # PATCH-FIX-OPENSUSE remove checks for libmono in mono-find-provides and mono-find-requires scripts @@ -285,6 +287,10 @@ make # install the rpm file attributes to arm the dependency scanner mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs install %{SOURCE3} %{buildroot}%{_rpmconfigdir}/fileattrs/mono.attr + +# Install custom mono-find-{provides/requires} +install -p -m755 %{SOURCE4} %{SOURCE5} %{buildroot}%{_rpmconfigdir} + %endif # Remove hardcoded lib directory from the config @@ -1306,6 +1312,8 @@ Mono development tools. %if 0%{?suse_version} > 1500 %{_rpmconfigdir}/fileattrs/mono.attr +%{_rpmconfigdir}/mono-find-provides +%{_rpmconfigdir}/mono-find-requires %endif %{_bindir}/mono-find-provides diff --git a/mono-find-provides b/mono-find-provides new file mode 100644 index 0000000..d2cb60f --- /dev/null +++ b/mono-find-provides @@ -0,0 +1,42 @@ +#!/usr/bin/bash +# +# mono-find-provides +# +# Authors: +# Ben Maurer (bmaurer@ximian.com) +# +# (C) 2005 Novell (http://www.novell.com) +# +# Args: builddir buildroot libdir + +IFS=$'\n' +filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) +monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) + +# If monodis is in the package being installed, use that one +# This is to support building mono +build_bindir="$2/usr/bin" +build_libdir="$2$3" + +if [ -x $build_bindir/monodis ]; then + monodis="$build_bindir/monodis" + export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +elif [ -x /usr/bin/monodis ]; then + monodis="/usr/bin/monodis" +else + exit 0; +fi + +export MONO_SHARED_DIR=$1 + +for i in "${monolist[@]}"; do + ($monodis --assembly $i | awk ' + BEGIN { LIBNAME=""; VERSION=""; } + /^Version:/ { VERSION=$2 } + /^Name:/ { LIBNAME=$2 } + END { + if (VERSION && LIBNAME) + print "mono(" LIBNAME ") = " VERSION + } + ') 2>/dev/null +done diff --git a/mono-find-requires b/mono-find-requires new file mode 100644 index 0000000..5955a48 --- /dev/null +++ b/mono-find-requires @@ -0,0 +1,86 @@ +#!/usr/bin/bash +# +# mono-find-requires +# +# Authors: +# Ben Maurer (bmaurer@ximian.com) +# +# (C) 2005 Novell (http://www.novell.com) +# +# Args: builddir buildroot libdir + +IFS=$'\n' +filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) +monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) + +# If monodis is in the package being installed, use that one +# This is to support building mono +build_bindir="$2/usr/bin" +build_libdir="$2$3" + +if [ -x $build_bindir/monodis ]; then + monodis="$build_bindir/monodis" + export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +elif [ -x /usr/bin/monodis ]; then + monodis="/usr/bin/monodis" +else + exit 0; +fi + +export MONO_SHARED_DIR=$1 + +REQUIRES=$( + for i in "${monolist[@]}"; do + ($monodis --assemblyref $i | awk ' + BEGIN { START=0; LIBNAME=""; VERSION=""; } + (START==0) && /^[0-9]+: Version=/ { + START=1; + sub(/Version=/, "", $2); + VERSION=$2 + } + + (START==1) && /^\tName=/ { + sub(/Name=/, "", $1); + LIBNAME=$1 + + print "mono(" LIBNAME ") = " VERSION + START=0 + } + ') 2> /dev/null + done +) + +PROVIDES=$( + for i in "${monolist[@]}"; do + ($monodis --assembly $i | awk ' + BEGIN { LIBNAME=""; VERSION=""; } + /^Version:/ { VERSION=$2 } + /^Name:/ { LIBNAME=$2 } + END { + if (VERSION && LIBNAME) + print "mono(" LIBNAME ") = " VERSION + } + ') 2>/dev/null + done +) +# +# This is a little magic trick to get all REQUIRES that are not +# in PROVIDES. While RPM functions correctly when such deps exist, +# they make the metadata a bit bloated. +# + +# Filter out dups from both lists +REQUIRES=$(echo "$REQUIRES" | sort | uniq) +PROVIDES=$(echo "$PROVIDES" | sort | uniq) + +# +# Get a list of elements that exist in exactly one of PROVIDES or REQUIRES +# +UNIQ=$(echo "$PROVIDES +$REQUIRES" | sort | uniq -u) + +# +# Of those, only chose the ones that are in REQUIRES +# +echo "$UNIQ +$REQUIRES" | sort | uniq -d diff --git a/mono.attr b/mono.attr index 6ef5541..1302bf6 100644 --- a/mono.attr +++ b/mono.attr @@ -1,3 +1,3 @@ -%__mono_provides %{_bindir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} -%__mono_requires %{_bindir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_provides %{_rpmconfigdir}/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_requires %{_rpmconfigdir}/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} %__mono_magic Mono/.Net assembly From c8fe4f75c4ede40b7cbcea56cabdca00f0a419887756fb66d880916b5bee662b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 28 May 2020 07:04:24 +0000 Subject: [PATCH 4/5] - OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=212 --- mono-find-requires | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mono-find-requires b/mono-find-requires index 5955a48..9e2feca 100644 --- a/mono-find-requires +++ b/mono-find-requires @@ -42,8 +42,12 @@ REQUIRES=$( (START==1) && /^\tName=/ { sub(/Name=/, "", $1); LIBNAME=$1 - - print "mono(" LIBNAME ") = " VERSION + # Allow rpm deps to be resolved for 1.0 profile version + if (VERSION=="1.0.3300.0") + OP=">=" + else + OP="=" + print "mono(" LIBNAME ") " OP " " VERSION START=0 } ') 2> /dev/null From 07868eb38893a0c9097d7185a4e88ef611961e7eae05d368b812237ec2e3d413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 28 May 2020 07:05:27 +0000 Subject: [PATCH 5/5] - OBS-URL: https://build.opensuse.org/package/show/Mono:Factory/mono-core?expand=0&rev=213 --- mono-core.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mono-core.changes b/mono-core.changes index 45b5330..a717e91 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 28 07:05:06 UTC 2020 - Ismail Dönmez + +- Fixup mono-find-requires for v1 profiles + ------------------------------------------------------------------- Wed May 27 09:35:05 UTC 2020 - Ismail Dönmez