diff --git a/.dotnet.metadata b/.dotnet.metadata index 133d204..9e559d9 100644 --- a/.dotnet.metadata +++ b/.dotnet.metadata @@ -1 +1 @@ -88a5b4436d7f848b33121f8aad2d37dc9ba93a1f SOURCES/dotnet-v2.1.513-SDK.tar.gz +5c5b46b55bf1f7fe2b2417df61231c9a86634531 SOURCES/dotnet-v2.1.514-SDK.tar.gz diff --git a/.gitignore b/.gitignore index f90b675..77d6caa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v2.1.513-SDK.tar.gz +SOURCES/dotnet-v2.1.514-SDK.tar.gz diff --git a/SOURCES/build-coreclr-mscorlib.patch b/SOURCES/build-coreclr-mscorlib.patch new file mode 100644 index 0000000..ca59e77 --- /dev/null +++ b/SOURCES/build-coreclr-mscorlib.patch @@ -0,0 +1,40 @@ +From 5164e76ce01fc36833a7f5e6fb7b1ec2f55c2262 Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Wed, 1 Aug 2018 12:02:53 -0400 +Subject: [PATCH] Use the identified python when building + System.Private.CoreLib (#19043) + +build.sh and build.cmd contain logic to identify a working version of +python to use. System.Private.CoreLib ignores that and directly invokes +'python', which may not work, or even execute a different program. +--- + build.sh | 2 ++ + src/System.Private.CoreLib/System.Private.CoreLib.csproj | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build.sh b/build.sh +index 091d6227caf..4002f2744c2 100755 +--- a/build.sh ++++ b/build.sh +@@ -22,6 +22,8 @@ then + exit 1 + fi + ++export PYTHON ++ + usage() + { + echo "Usage: $0 [BuildArch] [BuildType] [-verbose] [-coverage] [-cross] [-clangx.y] [-ninja] [-configureonly] [-skipconfigure] [-skipnative] [-skipmscorlib] [-skiptests] [-stripsymbols] [-ignorewarnings] [-cmakeargs] [-bindir]" +diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj +index 9a2fc681703..0a02d3cffdf 100644 +--- a/src/mscorlib/System.Private.CoreLib.csproj ++++ b/src/mscorlib/System.Private.CoreLib.csproj +@@ -543,7 +543,7 @@ + + $(IntermediateOutputPath)..\cmake.definitions + +- ++ + + + true diff --git a/SOURCES/build-corefx-disable-werror.patch b/SOURCES/build-corefx-disable-werror.patch new file mode 100644 index 0000000..aadb6c7 --- /dev/null +++ b/SOURCES/build-corefx-disable-werror.patch @@ -0,0 +1,12 @@ +diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt +index 7d804a1e54..717c2718d7 100644 +--- a/src/Native/Unix/CMakeLists.txt ++++ b/src/Native/Unix/CMakeLists.txt +@@ -25,7 +25,6 @@ add_compile_options(-fPIC) + add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) + add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) + add_compile_options(-g) +-add_compile_options(-Werror) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) + add_compile_options(-Wno-unreachable-code) + endif () diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index eba319d..6acb409 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -28,9 +28,9 @@ %global simple_name dotnet -%global host_version 2.1.17 -%global runtime_version 2.1.17 -%global sdk_version 2.1.513 +%global host_version 2.1.18 +%global runtime_version 2.1.18 +%global sdk_version 2.1.514 Name: dotnet Version: %{sdk_version} @@ -48,10 +48,14 @@ Source2: dotnet.sh Patch10: corefx-optflags-support.patch Patch11: corefx-32956-alpn.patch +# This patch is generally applied at tarball-build time, except when we dont build the tarball +Patch12: build-corefx-disable-werror.patch Patch100: coreclr-build-python3.patch Patch101: coreclr-cmake-python3.patch Patch102: coreclr-pie.patch +# This patch is generally applied at tarball-build time, except when we dont build the tarball +Patch103: build-coreclr-mscorlib.patch Patch300: core-setup-4510-commit-id.patch Patch301: core-setup-pie.patch @@ -196,12 +200,14 @@ applications and micro-services. pushd src/corefx %patch10 -p1 %patch11 -p1 +%patch12 -p1 popd pushd src/coreclr %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 popd pushd src/core-setup @@ -316,6 +322,14 @@ rm %{buildroot}%{_libdir}/%{simple_name}/dotnet %{_libdir}/%{simple_name}/sdk/%{sdk_version} %changelog +* Thu Apr 30 2020 Omair Majid - 2.1.514-2 +- Update to new tarball for the release +- Resolves: RHBZ#1830065 + +* Thu Apr 30 2020 Omair Majid - 2.1.514-1 +- Update to .NET Core SDK 2.1.514 and Runtime 2.1.18 +- Resolves: RHBZ#1830065 + * Mon Mar 23 2020 Omair Majid - 2.1.513-2 - Update to .NET Core SDK 2.1.513 and Runtime 2.1.17 - Resolves: RHBZ#1815640