diff options
Diffstat (limited to 'lang/dotnet8')
| -rw-r--r-- | lang/dotnet8/Makefile | 6 | ||||
| -rw-r--r-- | lang/dotnet8/files/patch-clang19 | 31 | ||||
| -rw-r--r-- | lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp | 24 |
3 files changed, 58 insertions, 3 deletions
diff --git a/lang/dotnet8/Makefile b/lang/dotnet8/Makefile index 7d6b24eb3fae..654e3099bef0 100644 --- a/lang/dotnet8/Makefile +++ b/lang/dotnet8/Makefile @@ -1,7 +1,7 @@ PORTNAME= dotnet DISTVERSIONPREFIX= v DISTVERSION= ${DOTNETVERSION}.6 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= lang devel MASTER_SITES= https://github.com/dotnet/dotnet/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/release.json?dummy=/:dotnetmanifest \ LOCAL/arrowd/dotnet/:bootstrap @@ -31,7 +31,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ RUN_DEPENDS= terminfo-db>0:misc/terminfo-db \ dotnet:lang/dotnet-host -USES= autoreconf:build gssapi:mit llvm:noexport,max=17 nodejs pkgconfig \ +USES= autoreconf:build gssapi:mit llvm:noexport nodejs pkgconfig \ python:build,3.9+ shebangfix ssl USE_GITHUB= yes @@ -40,7 +40,7 @@ SHEBANG_FILES= src/diagnostics/src/Tools/dotnet-trace/*.sh \ src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/updateAssemblyInfo.sh BINARY_ALIAS= grep=${LOCALBASE}/bin/ggrep -DOTNET_ENV= PYTHON=${PYTHON_CMD} +DOTNET_ENV= PYTHON=${PYTHON_CMD} PATH=${PATH}:${LLVM_PREFIX}/bin BOOTSTRAP_DOTNETVERSION= 8.0 BOOTSTRAP_SDKVERSION= ${BOOTSTRAP_DOTNETVERSION}.100 diff --git a/lang/dotnet8/files/patch-clang19 b/lang/dotnet8/files/patch-clang19 new file mode 100644 index 000000000000..3b54459f15a1 --- /dev/null +++ b/lang/dotnet8/files/patch-clang19 @@ -0,0 +1,31 @@ +By Omair Majid. Obtained from Alpine Linux. + +Notably, Dotnet-9 already has these. + + -mi +--- src/runtime/src/coreclr/vm/comreflectioncache.hpp 2024-05-28 12:53:38.000000000 -0400 ++++ src/runtime/src/coreclr/vm/comreflectioncache.hpp 2025-04-28 21:59:11.041285000 -0400 +@@ -27,4 +27,5 @@ + void Init(); + ++#ifndef DACCESS_COMPILE + BOOL GetFromCache(Element *pElement, CacheType& rv) + { +@@ -103,4 +104,5 @@ + this->LeaveWrite(); + } ++#endif // !ACCESS_COMPILE + + private: +@@ -142,4 +144,5 @@ + } + ++#ifndef DACCESS_COMPILE + void AdjustStamp(BOOL hasWriterLock) + { +@@ -171,4 +174,5 @@ + this->LeaveWrite(); + } ++#endif // !ACCESS_COMPILE + + void UpdateHashTable(SIZE_T hash, int slot) diff --git a/lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp b/lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp new file mode 100644 index 000000000000..09a320c03831 --- /dev/null +++ b/lang/dotnet8/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp @@ -0,0 +1,24 @@ +https://github.com/dotnet/diagnostics/pull/5547 + +--- src/diagnostics/src/SOS/extensions/hostcoreclr.cpp.orig 2024-05-28 16:53:38 UTC ++++ src/diagnostics/src/SOS/extensions/hostcoreclr.cpp +@@ -460,11 +460,6 @@ static HRESULT GetHostRuntime(std::string& coreClrPath + // If the hosting runtime isn't already set, use the runtime we are debugging + if (g_hostRuntimeDirectory == nullptr) + { +-#if defined(HOST_FREEBSD) +- TraceError("Hosting on NetBSD not supported\n"); +- return E_FAIL; +-#else +- + HRESULT Status = E_FAIL; + std::vector<ProbingStrategy> strategyList = { + { ProbeEnvVarInstallationHint, RuntimeHostingConstants::DotnetRootArchSpecificEnvVar } +@@ -527,7 +522,6 @@ static HRESULT GetHostRuntime(std::string& coreClrPath + coreClrPath.append(DIRECTORY_SEPARATOR_STR_A); + coreClrPath.append(MAKEDLLNAME_A("coreclr")); + return S_OK; +-#endif + } + + /**********************************************************************\ |