summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Popov <arrowd@FreeBSD.org>2025-08-29 15:29:57 +0300
committerGleb Popov <arrowd@FreeBSD.org>2025-09-06 18:34:38 +0300
commit077572c13edadb7f1556efc00518baf80b1852bf (patch)
treeade065cbba96625908dc9fa558fbe4997148dea8
parentnet/chrony: fix "socket" test and re-enable (diff)
lang/dotnet: Pull in upstream patch
-rw-r--r--lang/dotnet/Makefile1
-rw-r--r--lang/dotnet/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp24
2 files changed, 25 insertions, 0 deletions
diff --git a/lang/dotnet/Makefile b/lang/dotnet/Makefile
index 91d2600c520c..b34d8537baf5 100644
--- a/lang/dotnet/Makefile
+++ b/lang/dotnet/Makefile
@@ -1,6 +1,7 @@
PORTNAME= dotnet
DISTVERSIONPREFIX= v
DISTVERSION= ${DOTNETVERSION}.6
+PORTREVISION= 1
CATEGORIES= lang devel
MASTER_SITES= https://github.com/dotnet/dotnet/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/release.json?dummy=/:dotnetmanifest \
https://github.com/sec/dotnet-core-freebsd-source-build/releases/download/${BOOTSTRAP_SDKVERSION}-vmr/:bootstrap
diff --git a/lang/dotnet/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp b/lang/dotnet/files/patch-src_diagnostics_src_SOS_extensions_hostcoreclr.cpp
new file mode 100644
index 000000000000..83760061a737
--- /dev/null
+++ b/lang/dotnet/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 2025-05-20 22:48:44 UTC
++++ src/diagnostics/src/SOS/extensions/hostcoreclr.cpp
+@@ -476,11 +476,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)
+- TraceHostingError("FreeBSD not supported\n");
+- return E_FAIL;
+-#else
+-
+ HRESULT Status = E_FAIL;
+ std::vector<ProbingStrategy> strategyList = {
+ { ProbeEnvVarInstallationHint, RuntimeHostingConstants::DotnetRootArchSpecificEnvVar }
+@@ -546,7 +541,6 @@ static HRESULT GetHostRuntime(std::string& coreClrPath
+ coreClrPath.append(DIRECTORY_SEPARATOR_STR_A);
+ coreClrPath.append(MAKEDLLNAME_A("coreclr"));
+ return S_OK;
+-#endif
+ }
+
+ /**********************************************************************\