diff --git a/dotnet6.0.spec b/dotnet6.0.spec index d222adf..fc63a3f 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -86,6 +86,8 @@ Source11: dotnet.sh.in Patch100: runtime-arm64-lld-fix.patch # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315 Patch101: runtime-mono-remove-ilstrip.patch +# https://github.com/dotnet/runtime/pull/61442 +Patch102: runtime-61442-disable-werror.patch # https://github.com/dotnet/command-line-api/pull/1401 Patch300: command-line-api-use-work-tree-with-git-apply.patch @@ -411,6 +413,7 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/native/corehos pushd src/runtime.* %patch100 -p1 %patch101 -p1 +%patch102 -p1 popd pushd src/command-line-api.* diff --git a/runtime-61442-disable-werror.patch b/runtime-61442-disable-werror.patch new file mode 100644 index 0000000..401440c --- /dev/null +++ b/runtime-61442-disable-werror.patch @@ -0,0 +1,41 @@ +From f41c06ba040adf1930156340c5b03d9864d8a1d4 Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Wed, 10 Nov 2021 17:54:45 -0500 +Subject: [PATCH] The 6.0 branch is no longer pre-release + +This has limited affects, but it should have been set to false since 6.0 +is now stable/released. + +The one difference it makes is that -Werror is disabled when building +native code. +--- + Directory.Build.props | 2 +- + eng/native/configureplatform.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index f19ea9208c2c..5cb87bb7c257 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -255,7 +255,7 @@ + https://go.microsoft.com/fwlink/?LinkID=799421 + + +- true ++ false + $(MSBuildProjectName.Contains('Private')) + + true +diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake +index 519431772004..af1c88bce5b6 100644 +--- a/eng/native/configureplatform.cmake ++++ b/eng/native/configureplatform.cmake +@@ -2,7 +2,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/functions.cmake) + + # If set, indicates that this is not an officially supported release + # Keep in sync with IsPrerelease in Directory.Build.props +-set(PRERELEASE 1) ++set(PRERELEASE 0) + + #---------------------------------------- + # Detect and set platform variable names