Update to .NET SDK 6.0.136 and Runtime 6.0.36
Resolves: RHEL-65363
This commit is contained in:
Omair Majid
parent
b97e397e03
commit
e39ceadda8
1
.gitignore
vendored
1
.gitignore
vendored
@ -32,3 +32,4 @@
|
||||
/dotnet-v6.0.132.tar.gz
|
||||
/dotnet-v6.0.133.tar.gz
|
||||
/dotnet-v6.0.135.tar.gz
|
||||
/dotnet-v6.0.136.tar.gz
|
||||
|
||||
@ -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.35
|
||||
%global runtime_version 6.0.35
|
||||
%global host_version 6.0.36
|
||||
%global runtime_version 6.0.36
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 6.0.135
|
||||
%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,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 14 2024 Omair Majid <omajid@redhat.com>
|
||||
- Update to .NET SDK 6.0.136 and Runtime 6.0.36
|
||||
- Resolves: RHEL-65363
|
||||
|
||||
* Tue Oct 15 2024 Omair Majid <omajid@redhat.com> - 6.0.135-2
|
||||
- Update to .NET SDK 6.0.135 and Runtime 6.0.35
|
||||
- Resolves: RHEL-60799
|
||||
|
||||
54
runtime-clang-19.patch
Normal file
54
runtime-clang-19.patch
Normal file
@ -0,0 +1,54 @@
|
||||
commit e356f564bf74909e77d000e3ad1b8b43c30d070c (HEAD -> release/8.0)
|
||||
Author: Omair Majid <omajid@redhat.com>
|
||||
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)
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (dotnet-v6.0.135.tar.gz) = e535427f04db0bd0aa60e4292dd146890c5e570ec266749a80dbe227558df70ca5cef88ea10f791d6cbf9b17f1d0b0a579560a6d6cbea131ce2056011c0932ac
|
||||
SHA512 (dotnet-v6.0.136.tar.gz) = 19bbcf78df970ec170fced732023448d644a902317eb42a3e2707d201f34478cdda366469a575477e36ef1a396bb0c57bd52265b57848587a555586d805183dd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user