bootstrap build for epel8

mono-6.6.0-fix-multi-arch-issue.patch

@@ -1,15 +0,0 @@
---- a/mono/eglib/eglib-config.h.in	2020-10-12 14:57:46.354634946 +0200
-+++ b/mono/eglib/eglib-config.h.in	2020-10-12 15:00:10.106637683 +0200
-@@ -26,7 +26,11 @@
- typedef @GSIZE@ gsize;
- typedef @GSSIZE@ gssize;
- 
--#define G_GSIZE_FORMAT   @GSIZE_FORMAT@
-+#ifdef __i386__
-+#define G_GSIZE_FORMAT   "u"
-+#else
-+#define G_GSIZE_FORMAT   "lu"
-+#endif
- 
- #if defined (HOST_WATCHOS)
- #undef G_BREAKPOINT

mono-6.6.0-python3.patch

@@ -0,0 +1,53 @@
+--- a/scripts/mono-heapviz
++++ b/scripts/mono-heapviz
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ # Generate a heap visualization for SGen from the heap dump written by
+ # mono if the MONO_GC_DEBUG is set to something like
+diff -up mono-5.18.1.0/mono/mini/genmdesc.py.py3 mono-5.18.1.0/mono/mini/genmdesc.py
+--- mono-5.18.1.0/mono/mini/genmdesc.py.py3	2019-03-28 06:56:35.765851125 -0400
++++ mono-5.18.1.0/mono/mini/genmdesc.py	2019-03-28 06:56:44.805851125 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ #
+ # This tool is used to generate the cpu-<ARCH>.h files used by the JIT. The input is the
+diff -up mono-5.18.1.0/mono/mini/Makefile.am.in.py3 mono-5.18.1.0/mono/mini/Makefile.am.in
+--- mono-5.18.1.0/mono/mini/Makefile.am.in.py3	2019-03-28 07:01:10.975851125 -0400
++++ mono-5.18.1.0/mono/mini/Makefile.am.in	2019-03-28 07:01:35.395851125 -0400
+@@ -780,7 +780,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i
+ 
+ GENMDESC_OPTS=
+ 
+-GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
++GENMDESC_PRG=python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir)
+ 
+ cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py
+ 	$(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md
+diff -up mono-5.18.1.0/mono/mini/Makefile.am.py3 mono-5.18.1.0/mono/mini/Makefile.am
+--- mono-5.18.1.0/mono/mini/Makefile.am.py3	2019-03-28 07:06:02.235851125 -0400
++++ mono-5.18.1.0/mono/mini/Makefile.am	2019-03-28 07:06:06.385851125 -0400
+@@ -780,7 +780,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i
+ 
+ GENMDESC_OPTS=
+ 
+-GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
++GENMDESC_PRG=python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir)
+ 
+ cpu-wasm.h: mini-ops.h cpu-wasm.md $(srcdir)/genmdesc.py
+ 	$(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md
+diff -up mono-5.18.1.0/mono/mini/Makefile.in.py3 mono-5.18.1.0/mono/mini/Makefile.in
+--- mono-5.18.1.0/mono/mini/Makefile.in.py3	2019-03-28 07:06:12.805851125 -0400
++++ mono-5.18.1.0/mono/mini/Makefile.in	2019-03-28 07:06:21.575851125 -0400
+@@ -1287,7 +1287,7 @@ libmonoincludedir = $(includedir)/mono-$
+ libmonoinclude_HEADERS = jit.h
+ CSFLAGS = -unsafe -nowarn:0219,0169,0414,0649,0618
+ GENMDESC_OPTS = 
+-GENMDESC_PRG = python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
++GENMDESC_PRG = python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir)
+ LLVM_AOT_RUNTIME_OPTS = $(if $(LLVM),--llvm,)
+ @AMD64_FALSE@LLVM_AOT_COMPILER_OPTS = 
+ @AMD64_TRUE@LLVM_AOT_COMPILER_OPTS = $(if $(LLVM),"=llvmllc=-mcpu=generic -mattr=+sse3",)

mono.spec

@@ -1,9 +1,8 @@
-%bcond_with bootstrap
-
 %ifarch s390x
 # workaround https://github.com/mono/mono/issues/9009#issuecomment-477073609
 %undefine _hardened_build
 %endif
+%global bootstrap 1
 %if 0%{?el6}
 # see https://fedorahosted.org/fpc/ticket/395, it was added to el7
 %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le
@@ -16,15 +15,15 @@
 %global _monogacdir %{_monodir}/gac
 %endif
 
-%if 0%{?rhel}%{?el6}%{?el7} || %{with bootstrap}
+%if 0%{?rhel}%{?el6}%{?el7} || 0%{?bootstrap}
 # to resolve: "ERROR: No build ID note found"
 %undefine _missing_build_ids_terminate_build
 %endif
 
-%global xamarinrelease 182
+%global xamarinrelease 161
 Name:           mono
-Version:        6.12.0
-Release:        9%{?dist}
+Version:        6.6.0
+Release:        6%{?dist}
 Summary:        Cross-platform, Open Source, .NET development framework
 
 License:        MIT
@@ -49,6 +48,7 @@ Patch5:         mono-6.6.0-roslyn-binaries.patch
 Patch6:         mono-5.18.0-use-mcs.patch
 Patch7:         mono-5.18.0-reference-assemblies-fix.patch
 Patch8:         mono-5.18.0-sharpziplib-parent-path-traversal.patch
+Patch9:         mono-6.6.0-python3.patch
 # Fix NRE bug in api-doc-tools: https://github.com/mono/api-doc-tools/pull/464
 Patch10:        0001-DocumentationEnumerator.cs-Declare-iface-and-ifaceMe.patch
 # Replace new Csharp features with old to allow mdoc to build
@@ -56,10 +56,7 @@ Patch10:        0001-DocumentationEnumerator.cs-Declare-iface-and-ifaceMe.patch
 Patch11:        0001-Replace-new-Csharp-features-with-old-ones.patch
 # Reenable mdoc build. To be upstreamed after Patch 10 and 11
 Patch12:        0001-Reenable-mdoc.exe-build.patch
-# fix issue with conflicts between i686 and x86_64 package (#1853724)
-Patch13:	mono-6.6.0-fix-multi-arch-issue.patch
 
-BuildRequires: make
 BuildRequires:  bison
 BuildRequires:  python%{python3_pkgversion}
 BuildRequires:  cmake
@@ -74,12 +71,14 @@ BuildRequires:  perl-Getopt-Long
 
 # Yes, mono actually depends on itself, because
 # we deleted the bootstrapping binaries. If you
-# need to bootstrap mono, set _with_bootstrap at the top
-# which results in not deleting the binaries in %%prep.
+# need to bootstrap mono, comment out this BuildRequires
+# and don't delete the binaries in %%prep.
 
-%if %{without bootstrap}
-BuildRequires:  mono-core >= 6.12
-BuildRequires:  mono-devel >= 6.12
+%if 0%{bootstrap}
+# for bootstrap, use bundled monolite and reference assemblies instead of local mono
+%else
+BuildRequires:  mono-core >= 6.6
+BuildRequires:  mono-devel >= 6.6
 %endif
 
 # JIT only available on these:
@@ -98,7 +97,7 @@ metadata access libraries.
 %package core
 Summary:        The Mono CIL runtime, suitable for running .NET code
 Requires:       libgdiplus
-#dependency required for install
+#dependency requiered for install
 Provides:       mono(System.Collections.Immutable) = 1.2.0.0
 Provides:       mono(System.Diagnostics.StackTrace) = 4.0.2.0
 Provides:       mono(System.IO) = 4.0.10.0
@@ -182,7 +181,7 @@ assemblies: Microsoft.Vsa,
 System.Configuration.Install, System.Management, System.Messaging.
 
 %package reactive
-License:        MIT and ASL 2.0
+License:        MIT License (or similar) ; Apache License 2.0
 Summary:        Reactive Extensions for Mono core libraries
 Requires:       mono-core = %{version}-%{release}
 
@@ -191,7 +190,7 @@ Reactive Extensions for Mono, this packages don't depend on
 desktop-specific features.
 
 %package reactive-winforms
-License:        MIT and ASL 2.0
+License:        MIT License (or similar) ; Apache License 2.0
 Summary:        Reactive Extensions for Mono desktop-specific libraries
 Requires:       mono-core = %{version}-%{release}
 Requires:       mono-reactive = %{version}-%{release}
@@ -343,12 +342,12 @@ not install anything from outside the mono source (XSP, mono-basic, etc.).
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 pushd external/api-doc-tools
 %patch10 -p1
 %patch11 -p1
 popd
 %patch12 -p1
-%patch13 -p1
 
 # don't build mono-helix-client which requires the helix-binaries to build
 sed -i 's|mono-helix-client||g' mcs/tools/Makefile
@@ -362,7 +361,7 @@ sed -i 's|BOOTSTRAP_BIN_PROFILE = v4.7|BOOTSTRAP_BIN_PROFILE = v4.7.1|g' mcs/bui
 # Remove hardcoded lib directory for libMonoPosixHelper.so from the config
 sed -i 's|$mono_libdir/||g' data/config.in
 
-%if %{with bootstrap}
+%if 0%{bootstrap}
 # for bootstrap, keep some binaries
 find . -name "*.dll" -not -path "./mcs/class/lib/monolite-linux/*" -not -path "./external/binary-reference-assemblies/v4.7.1/*" -print -delete
 find . -name "*.exe" -not -path "./mcs/class/lib/monolite-linux/*" -print -delete
@@ -376,11 +375,6 @@ cd external/binary-reference-assemblies && mv v4.7.1 v4.7.1.tobuild && ln -s /us
 %endif
 
 %build
-# This package fails to build with LTO on ppc64le.  Root cause analysis has not been
-# done.  For now disable LTO
-%ifarch ppc64le
-%define _lto_cflags %{nil}
-%endif
 %ifarch s390x
 # either mono C code relies on undefined behaviour or gcc is even more broken than earlier
 RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 /-O1 /g')
@@ -420,7 +414,7 @@ cp external/binary-reference-assemblies/v4.7.1/*.dll %{buildroot}%{_monodir}/4.7
 rm -f %{buildroot}%{_libdir}/*.la
 # remove Windows-only stuff
 rm -rf %{buildroot}%{_monodir}/*/Mono.Security.Win32*
-#rm -f %{buildroot}%{_libdir}/libMonoSupportW.*
+rm -f %{buildroot}%{_libdir}/libMonoSupportW.*
 # remove .a files for libraries that are really only for us
 rm %{buildroot}%{_libdir}/*.a
 # remove libgc cruft
@@ -452,11 +446,9 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/mono-nunit.pc
 # remove dmcs because it requires the .net 4.0 sdk but we only deliver 4.5 with Fedora (#1294967)
 rm -f %{buildroot}%{_bindir}/dmcs
 
-# remove wrapper scripts for roslyn-binaries
+# remove csc
 rm -f %{buildroot}%{_bindir}/csc
 rm -f %{buildroot}%{_bindir}/csc-dim
-rm -f %{buildroot}%{_bindir}/csi
-rm -f %{buildroot}%{_bindir}/vbc
 
 # drop prj2make because the binary is not built anymore
 rm -f %{buildroot}%{_bindir}/prj2make
@@ -485,23 +477,16 @@ cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.5-api && cd -
 # as requested in bug 1704861; we have had that link in F29 with Mono 4.8 as well.
 cd %{buildroot}/usr/lib/mono && ln -s 4.7.1-api 4.0-api && cd -
 
-# for Epel7, we don't deliver these files, they are still provided by rpm-build-4.11.3-43.el7.x86_64
-%if 0%{?el7}%{?el8} == 0
 # rpm helper scripts
 mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs/
 install -p -m755 %{SOURCE2} %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/
 install -p -m644 %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/fileattrs/
-%endif
-
-# remove these files, we are using the files installed in /usr/lib/rpm/
-rm %{buildroot}%{_bindir}/mono-find-requires
-rm %{buildroot}%{_bindir}/mono-find-provides
 
 %find_lang mcs
 
 %post core
 %{?ldconfig}
-cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt
+cert-sync /etc/pki/tls/certs/ca-bundle.crt
 
 %ldconfig_postun
 
@@ -530,9 +515,11 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt
 %mono_bin ikdasm
 %mono_bin lc
 %{_bindir}/gacutil2
+%{_bindir}/csi
 %{_bindir}/mcs
 %{_monodir}/4.5/mcs.*
 %{_monodir}/4.5/mono-api-diff.*
+%{_bindir}/vbc
 %mono_bin mozroots
 %mono_bin pdb2mdb
 %mono_bin setreg
@@ -553,7 +540,6 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt
 %{_mandir}/man1/lc.1.gz
 %{_mandir}/man1/mprof-report.1.gz
 %{_libdir}/libMonoPosixHelper.so*
-%{_libdir}/libMonoSupportW.so*
 %{_libdir}/libmono-native.so*
 %dir %{_monodir}
 %dir %{_monodir}/4.5
@@ -670,8 +656,10 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt
 %mono_bin mkbundle
 %mono_bin makecert
 %mono_bin mono-cil-strip
+%{_bindir}/mono-find-provides
+%{_bindir}/mono-find-requires
 %{_bindir}/monodis
-%{_bindir}/monolinker
+%mono_bin monolinker
 %mono_bin mono-shlib-cop
 %mono_bin mono-xmltool
 %mono_bin monop
@@ -758,13 +746,8 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt
 %{_includedir}/mono-2.0/mono/metadata/*.h
 %{_includedir}/mono-2.0/mono/utils/*.h
 %{_includedir}/mono-2.0/mono/cil/opcode.def
-
-# for Epel7, we don't deliver these files, they are still provided by rpm-build-4.11.3-43.el7.x86_64
-%if 0%{?el7}%{?el8} == 0
 %{_prefix}/lib/rpm/mono-find-*
 %{_prefix}/lib/rpm/fileattrs/mono.attr
-%endif
-
 %{_bindir}/aprofutil
 %mono_bin aprofutil
 %{_mandir}/man1/aprofutil.1.gz
@@ -941,63 +924,8 @@ cert-sync --quiet /etc/pki/tls/certs/ca-bundle.crt
 %files complete
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jun 16 2022 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.12.0-8
-- Upgrade to Mono 6.12.0.182
-
-* Fri Feb 11 2022 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.12.0-7
-- Fixing license for mono-reactive packages, fixing bug 2025856
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Feb 27 2021 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.12.0-4
-- Upgrade to Mono 6.12.0.122
-
-* Mon Feb 22 2021 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.12.0-3
-- backport patch: fix early return in Process.Start (#1839410)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Dec 22 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.12.0-1
-- Upgrade to Mono 6.12.0.107
-
-* Tue Oct 27 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.12.0-0
-- Upgrade to Mono 6.12.0.90
-
-* Mon Oct 12 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.10.0-1
-- fix issue with conflicts between i686 and x86_64 package (#1853724)
-
-* Mon Sep 28 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.10.0-0
-- Upgrade to Mono 6.10.0.104
-
-* Fri Aug 21 2020 François Cami <fcami@redhat.com> - 6.8.0-6
-- Ship libMonoSupportW.so
-
-* Tue Aug 11 2020 Jeff Law <law@redhat.com> - 6.8.0-5
-- Disable LTO on ppc64le
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jun 27 2020 Jeff Smith <whydoubt@gmail.com> - 6.8.0-2
-- Remove wrapper scripts for unbuilt csi.exe and vbc.exe
-
-* Fri Jun 19 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-1
-- build without bootstrap
-
-* Fri Jun 19 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.8.0-0
-- upgrade to Mono 6.8.0.123, with a bootstrap build
+* Sat Feb 29 2020 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 6.6.0-6
+- Bootstrap build for Epel 8
 
 * Mon Feb 03 2020 Robert-André Mauchin <zebob.m@gmail.com> - 6.6.0-5
 - Reenable mdoc build (#1797360)

sources

@@ -1 +1 @@
-SHA512 (mono-6.12.0.182.tar.xz) = 5f0f02f2adf89785af8f620c16d69fc97b87c9b39133286e6f1237a397f4842ea8d26802d9f802f8798a86540dc1bc3b5201428f218c78fbcf91f0d575cde512
+SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186