diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index 6521720..1734488 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -2ab042bd26f92c6d7608a790b43a284e8721463e SOURCES/dotnet-v6.0.133.tar.gz +051af338d9195a45418a5c24a4b63ff7cab22100 SOURCES/dotnet-v6.0.136.tar.gz diff --git a/.gitignore b/.gitignore index d5876d4..327077b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.133.tar.gz +SOURCES/dotnet-v6.0.136.tar.gz diff --git a/SOURCES/runtime-clang-19.patch b/SOURCES/runtime-clang-19.patch new file mode 100644 index 0000000..dc9d329 --- /dev/null +++ b/SOURCES/runtime-clang-19.patch @@ -0,0 +1,54 @@ +commit e356f564bf74909e77d000e3ad1b8b43c30d070c (HEAD -> release/8.0) +Author: Omair Majid +Date: Tue Oct 15 14:53:33 2024 -0400 + + Fix clang19 build (#105141) + +diff --git a/src/runtime/src/coreclr/vm/comreflectioncache.hpp b/src/runtime/src/coreclr/vm/comreflectioncache.hpp +index 08d173e6164..12db55251d8 100644 +--- a/src/coreclr/vm/comreflectioncache.hpp ++++ b/src/coreclr/vm/comreflectioncache.hpp +@@ -26,6 +26,7 @@ public: + + void Init(); + ++#ifndef DACCESS_COMPILE + BOOL GetFromCache(Element *pElement, CacheType& rv) + { + CONTRACTL +@@ -102,6 +103,7 @@ public: + AdjustStamp(TRUE); + this->LeaveWrite(); + } ++#endif // !DACCESS_COMPILE + + private: + // Lock must have been taken before calling this. +@@ -141,6 +143,7 @@ private: + return CacheSize; + } + ++#ifndef DACCESS_COMPILE + void AdjustStamp(BOOL hasWriterLock) + { + CONTRACTL +@@ -170,6 +173,7 @@ private: + if (!hasWriterLock) + this->LeaveWrite(); + } ++#endif // !DACCESS_COMPILE + + void UpdateHashTable(SIZE_T hash, int slot) + { +diff --git a/src/runtime/src/native/libs/CMakeLists.txt b/src/runtime/src/native/libs/CMakeLists.txt +index b8ec2cf654c..ca8590985d6 100644 +--- a/src/libraries/Native/Unix/CMakeLists.txt ++++ b/src/libraries/Native/Unix/CMakeLists.txt +@@ -35,6 +35,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) + add_compile_options(-Wno-cast-align) + add_compile_options(-Wno-typedef-redefinition) + add_compile_options(-Wno-c11-extensions) ++add_compile_options(-Wno-pre-c11-compat) # fixes build on Debian + add_compile_options(-Wno-unknown-pragmas) + add_compile_options(-Wno-unknown-warning-option) + add_compile_options(-Wno-unused-but-set-variable) diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index ce9f608..d8f14f2 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/dotnet6.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.33 -%global runtime_version 6.0.33 +%global host_version 6.0.36 +%global runtime_version 6.0.36 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.133 +%global sdk_version 6.0.136 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -88,6 +88,8 @@ Patch100: runtime-arm64-lld-fix.patch Patch101: runtime-mono-remove-ilstrip.patch # https://github.com/dotnet/runtime/pull/95217#issuecomment-1842799362 Patch102: runtime-re-enable-implicit-rejection.patch +# https://github.com/dotnet/runtime/pull/109198 +Patch103: runtime-clang-19.patch # Disable apphost, needed for s390x Patch500: fsharp-no-apphost.patch @@ -375,26 +377,27 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp pushd src/runtime -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 +%patch -P 100 -p1 +%patch -P 101 -p1 +%patch -P 102 -p1 +%patch -P 103 -p1 popd pushd src/fsharp -%patch500 -p1 +%patch -P 500 -p1 popd pushd src/arcade -%patch700 -p1 +%patch -P 700 -p1 popd pushd src/roslyn -%patch800 -p3 -%patch801 -p1 +%patch -P 800 -p3 +%patch -P 801 -p1 popd pushd src/roslyn-analyzers -%patch900 -p1 +%patch -P 900 -p1 popd pushd src/msbuild @@ -402,14 +405,14 @@ pushd src/msbuild # These are mono-specific fixes. Mono is only used on s390x. Restrict # patch to s390x to avoid potential risk in other architectures. %ifarch s390x -%patch1000 -p1 -%patch1001 -p1 +%patch -P 1000 -p1 +%patch -P 1001 -p1 %endif popd pushd src/sdk -%patch1500 -p1 +%patch -P 1500 -p1 popd pushd src/installer @@ -612,6 +615,14 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Thu Nov 14 2024 Omair Majid +- Update to .NET SDK 6.0.136 and Runtime 6.0.36 +- Resolves: RHEL-65363 + +* Tue Oct 15 2024 Omair Majid - 6.0.135-2 +- Update to .NET SDK 6.0.135 and Runtime 6.0.35 +- Resolves: RHEL-60799 + * Wed Aug 14 2024 Omair Majid - 6.0.133-2 - Update to .NET SDK 6.0.133 and Runtime 6.0.33 - Resolves: RHEL-52385