rpms/dotnet3.1
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dotnet3.1.git#7d66170eeba7d2f13cd15d1c05d1c259ba48c324
This commit is contained in:
DistroBaker 2020-12-06 22:14:36 +00:00
parent 8fcc147539
commit dc894d2c20
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dotnet3.1-gcc11.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp b/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp
index e6dc9f6d8..d42c0e0f2 100644
--- a/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp
+++ b/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp
@@ -11,6 +11,7 @@
#include <corehost_context_contract.h>
#include "host_context_test.h"
#include <utils.h>
+#include <thread>
namespace
{
@@ -539,4 +540,4 @@ bool host_context_test::load_assembly_and_get_function_pointer(
hostfxr_exports hostfxr{ hostfxr_path };
return load_assembly_and_get_function_pointer(hostfxr, config_path, argc, argv, config_log_prefix, test_output);
-}
\ No newline at end of file
+}

9
dotnet3.1.spec
View File

@ -55,7 +55,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: .NET Core Runtime and SDK
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
URL: https://github.com/dotnet/
@ -91,6 +91,8 @@ Patch300: core-setup-hardening-flags.patch
# Disable telemetry by default; make it opt-in
Patch500: cli-telemetry-optout.patch
Patch600: %{name}-gcc11.patch
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
ExclusiveArch: aarch64 x86_64
%else
@ -373,6 +375,8 @@ pushd src/cli.*
%patch500 -p1
popd
%patch600 -p1
# If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back
grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \
sed -i 's|\$(BuildArguments) </BuildArguments>|$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>|' repos/coreclr.common.props
@ -551,6 +555,9 @@ echo "Testing build results for debug symbols..."
%changelog
* Sun Dec 06 2020 Jeff Law <law@redhat.com> - 3.1.110-2
- Fix missing #include for gcc-11
* Tue Nov 10 2020 Omair Majid <omajid@redhat.com> - 3.1.110-1
- Update to .NET Core SDK 3.1.110 and Runtime 3.1.10