Commit 5dfaf3ed authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.202-1.el8_4

parent e6ce0e1c
4c29720e364b8d4c2cf8809085da20141b849c17 SOURCES/dotnet-v5.0.104-SDK.tar.gz
1c965a7ecefcf4745de02ad9d17de1fefb5f2165 SOURCES/dotnet-v5.0.202-SDK.tar.gz
SOURCES/dotnet-v5.0.104-SDK.tar.gz
SOURCES/dotnet-v5.0.202-SDK.tar.gz
......@@ -15,4 +15,4 @@ index de1ebb9e6..6bbf479de 100644
+
DebugHelper.HandleDebugSwitch(ref args);
new MulticoreJitActivator().TryActivateMulticoreJit();
// Capture the current timestamp to calculate the host overhead.
......@@ -14,16 +14,16 @@
%global __provides_exclude ^(%{privlibs})\\.so
%global __requires_exclude ^(%{privlibs})\\.so
# Filter flags not supported by clang
# -fstack-clash-protection
# -specs=
%global dotnet_cflags %(echo %optflags | sed -e 's/-fstack-clash-protection//' | sed -re 's/-specs=[^ ]*//g')
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 5.0.4
%global runtime_version 5.0.4
# LTO triggers a compilation error for a source level issue. Given that LTO should not
# change the validity of any given source and the nature of the error (undefined enum), I
# suspect a generator program is mis-behaving in some way. This needs further debugging,
# until that's done, disable LTO. This has to happen before setting the flags below.
%define _lto_cflags %{nil}
%global host_version 5.0.5
%global runtime_version 5.0.5
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 5.0.104
%global sdk_version 5.0.202
%global templates_version %{runtime_version}
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
......@@ -77,15 +77,19 @@ Patch100: runtime-linker-order.patch
Patch500: sdk-telemetry-optout.patch
Patch501: add-rocky-rid.patch
# ExclusiveArch: aarch64 x86_64
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
ExclusiveArch: aarch64 x86_64
%else
ExclusiveArch: x86_64
%endif
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
%if %{without bootstrap}
BuildRequires: dotnet-build-reference-packages
BuildRequires: dotnet-sdk-5.0
%if %{without bootstrap}
BuildRequires: dotnet5.0-build-reference-packages
BuildRequires: dotnet-sdk-5.0-source-built-artifacts
%endif
BuildRequires: findutils
......@@ -316,10 +320,11 @@ find -iname '*.so' -type f -delete
find -iname '*.tar.gz' -type f -delete
find -iname '*.nupkg' -type f -delete
find -iname '*.zip' -type f -delete
rm -rf .dotnet/
rm -rf packages/source-built
%endif
rm -rf .dotnet/
%if %{without bootstrap}
sed -i -e 's|5.0.100-preview1-014459|5.0.103|' global.json
mkdir -p packages/archive
......@@ -357,14 +362,42 @@ find -iname 'nuget.config' -exec echo {}: \; -exec cat {} \; -exec echo \;
%build
cat /etc/os-release
%if %{without bootstrap}
#%%if %%{without bootstrap}
# We need to create a copy because we will mutate this
cp -a %{_libdir}/dotnet previously-built-dotnet
#%%endif
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
# Setting this macro ensures that only clang supported options will be
# added to ldflags and cflags.
%global toolchain clang
%set_build_flags
%else
# Filter flags not supported by clang
%global dotnet_cflags %(echo %optflags | sed -re 's/-specs=[^ ]*//g')
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
export CFLAGS="%{dotnet_cflags}"
export CXXFLAGS="%{dotnet_cflags}"
export LDFLAGS="%{dotnet_ldflags}"
%endif
export EXTRA_CFLAGS="%{dotnet_cflags}"
export EXTRA_CXXFLAGS="%{dotnet_cflags}"
export EXTRA_LDFLAGS="%{dotnet_ldflags}"
%ifarch aarch64
# -mbranch-protection=standard breaks unwinding in CoreCLR through libunwind
CFLAGS=$(echo $CFLAGS | sed -e 's/-mbranch-protection=standard //')
CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-mbranch-protection=standard //')
%endif
# -fstack-clash-protection breaks CoreCLR
CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-clash-protection//' )
CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-clash-protection//' )
export EXTRA_CFLAGS="$CFLAGS"
export EXTRA_CXXFLAGS="$CXXFLAGS"
export EXTRA_LDFLAGS="$LDFLAGS"
unset CFLAGS
unset CXXFLAGS
unset LDFLAGS
#%%if %%{without bootstrap}
# --with-ref-packages %%{_libdir}/dotnet/reference-packages/ \
......@@ -373,9 +406,7 @@ export EXTRA_LDFLAGS="%{dotnet_ldflags}"
#%%endif
VERBOSE=1 ./build.sh \
%if %{without bootstrap}
--with-sdk previously-built-dotnet \
%endif
-- \
/v:n \
/p:SkipPortableRuntimeBuild=true \
......@@ -498,32 +529,40 @@ echo "Testing build results for debug symbols..."
%changelog
* Thu Apr 15 2021 Michael L. Young <elgueromexicano@gmail.com> - 5.0.104-1.rocky
* Tue May 18 2021 Michael L. Young <elgueromexicano@gmail.com> - 5.0.202-1.rocky
- Add Rocky Runtime ID
* Tue Mar 02 2021 Omair Majid <omajid@redhat.com> - 5.0.104-1
* Tue Apr 13 2021 Omair Majid <omajid@redhat.com> - 5.0.202-1
- Update to .NET SDK 5.0.202 and Runtime 5.0.5
- Resolves: RHBZ#1947662
* Tue Mar 09 2021 Omair Majid <omajid@redhat.com> - 5.0.104-2
- Update to .NET SDK 5.0.104 and Runtime 5.0.4
- Resolves: RHBZ#1934247
- Resolves: RHBZ#1934241
* Wed Feb 03 2021 Omair Majid <omajid@redhat.com> - 5.0.103-1
* Wed Feb 10 2021 Omair Majid <omajid@redhat.com> - 5.0.103-2
- Update to .NET SDK 5.0.103 and Runtime 5.0.3
- Resolves: RHBZ#1924765
- Resolves: RHBZ#1924762
* Tue Jan 05 2021 Omair Majid <omajid@redhat.com> - 5.0.102-2
- Rebuild with updated tests
- Resolves: RHBZ#1912684
* Mon Jan 04 2021 Omair Majid <omajid@redhat.com> - 5.0.102-1
* Wed Jan 13 2021 Omair Majid <omajid@redhat.com> - 5.0.102-2
- Update to .NET SDK 5.0.102 and Runtime 5.0.2
- Resolves: RHBZ#1912684
- Resolves: RHBZ#1912569
* Thu Dec 03 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.8.0201202git337413b
* Thu Dec 03 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.10.20201203git337413b
- Update to latest commit of .NET Core SDK 5.0.100 and Runtime 5.0.0
- Resolves: RHBZ#1897396
- Resolves: RHBZ#1897362
* Thu Nov 12 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.9
- Update to a work-in-progres .NET 5 GA build
- Resolves: RHBZ#1897362
* Mon Oct 26 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.8.rc1
- Bump version
- Resolves: RHBZ#1891094
* Fri Oct 23 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.7.rc1
- Update to .NET Core SDK 5.0.100 RC1 and Runtime 5.0.0 RC1
- Resolves: RHBZ#1891507
- Resolves: RHBZ#1891094
* Tue Sep 15 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.6.preview8
- Switch to a smaller tarball
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment