freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lang/dotnet[-runtime]: Use bundled libunwind in hope to avoiding random crashes

Browse Source 
Co-authored-by: Szczepan Ćwikliński <sec@thinkcode.pl>
This commit is contained in:
Gleb Popov
2024-12-10 21:17:31 +03:00
parent 988e7c4780
commit 6a69e4b5a8
4 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/dotnet-runtime/Makefile
+1
View File
@@ -1,6 +1,7 @@
PORTNAME= dotnet-host
DISTVERSIONPREFIX= v
DISTVERSION= 9.0.0
PORTREVISION= 1
CATEGORIES= lang devel
MAINTAINER= arrowd@FreeBSD.org
lang/dotnet-runtime/files/patch-bundled-libunwind
+42
View File
@@ -0,0 +1,42 @@
Use bundled libunwind until at least
https://github.com/libunwind/libunwind/issues/715
is fixed. It is also believed that using bundled libunwind may help against
random crashes on amd64 too.
--- src/native/corehost/apphost/static/CMakeLists.txt.orig
+++ src/native/corehost/apphost/static/CMakeLists.txt
@@ -244,7 +244,7 @@ endif(CLR_CMAKE_TARGET_APPLE)
# On *BSD, we always use the libunwind that's part of the OS
if(CLR_CMAKE_TARGET_FREEBSD)
- set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1)
+ set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 0)
endif()
if(CLR_CMAKE_USE_SYSTEM_LIBUNWIND AND NOT CLR_CMAKE_TARGET_APPLE)
--- src/coreclr/pal/src/CMakeLists.txt.orig
+++ src/coreclr/pal/src/CMakeLists.txt
@@ -1,7 +1,7 @@
if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_HAIKU)
# On OSX and *BSD, we use the libunwind that's part of the OS
# On Haiku, we used a special port of libunwind
- set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1)
+ set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 0)
endif(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_HAIKU)
if(NOT DEFINED ENV{ROOTFS_DIR})
--- src/native/external/libunwind.cmake.orig
+++ src/native/external/libunwind.cmake
@@ -96,7 +96,7 @@ elseif(CLR_CMAKE_TARGET_FREEBSD)
set(libunwind_la_SOURCES_arm_os arm/Gos-freebsd.c)
set(libunwind_la_SOURCES_arm_os_local arm/Los-freebsd.c)
set(libunwind_la_SOURCES_aarch64_os aarch64/Gos-freebsd.c)
- set(libunwind_la_SOURCES_aarch64_os_local aarch64/Los-freebsd.c)
+ set(libunwind_la_SOURCES_aarch64_os_local aarch64/Los-freebsd.c aarch64/setcontext.S)
list(APPEND libunwind_coredump_la_SOURCES coredump/_UCD_access_reg_freebsd.c)
elseif(CLR_CMAKE_HOST_SUNOS)
set(libunwind_la_SOURCES_os ${libunwind_la_SOURCES_os_solaris})
lang/dotnet/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
PORTNAME= dotnet
DISTVERSIONPREFIX= v
DISTVERSION= ${DOTNETVERSION}.0
PORTREVISION= 1
PORTREVISION= 2
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/9.0.0-rc.2-native/:bootstrap
lang/dotnet/files/patch-bundled-libunwind
+42
View File
@@ -0,0 +1,42 @@
Use bundled libunwind until at least
https://github.com/libunwind/libunwind/issues/715
is fixed. It is also believed that using bundled libunwind may help against
random crashes on amd64 too.
--- src/runtime/src/native/corehost/apphost/static/CMakeLists.txt.orig
+++ src/runtime/src/native/corehost/apphost/static/CMakeLists.txt
@@ -244,7 +244,7 @@ endif(CLR_CMAKE_TARGET_APPLE)
# On *BSD, we always use the libunwind that's part of the OS
if(CLR_CMAKE_TARGET_FREEBSD)
- set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1)
+ set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 0)
endif()
if(CLR_CMAKE_USE_SYSTEM_LIBUNWIND AND NOT CLR_CMAKE_TARGET_APPLE)
--- src/runtime/src/coreclr/pal/src/CMakeLists.txt.orig
+++ src/runtime/src/coreclr/pal/src/CMakeLists.txt
@@ -1,7 +1,7 @@
if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_HAIKU)
# On OSX and *BSD, we use the libunwind that's part of the OS
# On Haiku, we used a special port of libunwind
- set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1)
+ set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 0)
endif(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_HAIKU)
if(NOT DEFINED ENV{ROOTFS_DIR})
--- src/runtime/src/native/external/libunwind.cmake.orig
+++ src/runtime/src/native/external/libunwind.cmake
@@ -96,7 +96,7 @@ elseif(CLR_CMAKE_TARGET_FREEBSD)
set(libunwind_la_SOURCES_arm_os arm/Gos-freebsd.c)
set(libunwind_la_SOURCES_arm_os_local arm/Los-freebsd.c)
set(libunwind_la_SOURCES_aarch64_os aarch64/Gos-freebsd.c)
- set(libunwind_la_SOURCES_aarch64_os_local aarch64/Los-freebsd.c)
+ set(libunwind_la_SOURCES_aarch64_os_local aarch64/Los-freebsd.c aarch64/setcontext.S)
list(APPEND libunwind_coredump_la_SOURCES coredump/_UCD_access_reg_freebsd.c)
elseif(CLR_CMAKE_HOST_SUNOS)
set(libunwind_la_SOURCES_os ${libunwind_la_SOURCES_os_solaris})