From nobody Sun Dec 15 11:07:15 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB0dw02LXz5ggZf; Sun, 15 Dec 2024 11:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB0dv6YzYz4ZqB; Sun, 15 Dec 2024 11:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734260835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nbPYpRYPhdNU8vnTHATPXNSg1Y9BEvgb5K98HMes38=; b=IRa2X1xKiQma5z6A5V576KIADe5EvOmMPXYGl2JlTVM0YyleaXd6k6acZu0aT+tcN7Y3Om nRUvgiv4J7aO/o+/qLC9ca9sZ37icPbHNDi4X78u72iTUpPlq+UAEIAeH5t2jp5HWW/YnB hrsMWVNob/HKtAoxgn/zBsnRLNWMatteM9OwRBOsLc0RwnV42lRCgPmTzEp9gguy0YBrp4 l9rhqJXxkX+nQQ4lSbf4u9t0wESA21ut0PnloLs14Ng7raZAjBcrrDPIwSOME57q449Kh/ 3hcETCJwxHS/HE3pO6tUdSLlOyCBg2c6mr7hvHZqQ/xiqEKdyoin2lu76dxgiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734260835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nbPYpRYPhdNU8vnTHATPXNSg1Y9BEvgb5K98HMes38=; b=d4EjNwxwhZLzhXRfQwtgkidFhTorTIbJebiCJMjcQ5EXc9dGlqsHHSvaL0PMPdXB0cbJG+ +tEwoVj+Pr0tnx1plYnNcUS1JfbFoWOTgMIxPQ2zgvFUMKMxOkrz5FOHo1muK9z5mFaj1A GuXCxsPzHsLY6PYM62Mv72fDeWhA6xzyoK4FLQ3zOTpc/TKZyikYsPtT0/buyXVb9h+IhM 9hpyur6WJ2nkFbOF1bxq84XkGfUQETrXQn+woubxcqP8fuo6U12WptalJc0UIqWhdBavqb M5Ilzir0Jkawvv21FnbDlKjY7lDrBdZa3xNympnwjvZ7XcSdT/nD33RkIJN4Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734260835; a=rsa-sha256; cv=none; b=pzsV2xHRy+IXrpatyNfg4xXymDF+hnRNuJMOr2gjbm9R+sCTXSEGLqaUKXoNYjp5d3/K0/ TjvicyS7BONr10aEE4c2l7jbqtxVOgkkwZPXxZWe/OnRpo0ujghVwyqCX1GB3rZBUa/HsM jmBG7XcgytNqXi/uDpLcseVJYDRQ32yjWb67SMUC3iher6zMN+59yNc0/opnDgKptG2ABY f7bLjdnFeXamwL1GUG8+zYhwhZIdiystDM/FuI8SO2FopP2ShgY4d83/GxNzd/4xsMGy1w 9tOD4cDbUJvuXc/pj8pvkOMuTASj8jDgXEutJeBlJwNGoPmwc9Uz4ys6qc74bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB0dv66RZz15C3; Sun, 15 Dec 2024 11:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BFB7Ffq057284; Sun, 15 Dec 2024 11:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFB7Fbb057280; Sun, 15 Dec 2024 11:07:15 GMT (envelope-from git) Date: Sun, 15 Dec 2024 11:07:15 GMT Message-Id: <202412151107.4BFB7Fbb057280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 6a69e4b5a8b4 - main - lang/dotnet[-runtime]: Use bundled libunwind in hope to avoiding random crashes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a69e4b5a8b407997e620cfe4e2b969cf274de9e Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a69e4b5a8b407997e620cfe4e2b969cf274de9e commit 6a69e4b5a8b407997e620cfe4e2b969cf274de9e Author: Gleb Popov AuthorDate: 2024-12-10 18:17:31 +0000 Commit: Gleb Popov CommitDate: 2024-12-15 11:06:35 +0000 lang/dotnet[-runtime]: Use bundled libunwind in hope to avoiding random crashes Co-authored-by: Szczepan Ćwikliński --- lang/dotnet-runtime/Makefile | 1 + lang/dotnet-runtime/files/patch-bundled-libunwind | 42 +++++++++++++++++++++++ lang/dotnet/Makefile | 2 +- lang/dotnet/files/patch-bundled-libunwind | 42 +++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/lang/dotnet-runtime/Makefile b/lang/dotnet-runtime/Makefile index 60c84558eaf3..4dc4826ccdda 100644 --- a/lang/dotnet-runtime/Makefile +++ b/lang/dotnet-runtime/Makefile @@ -1,6 +1,7 @@ PORTNAME= dotnet-host DISTVERSIONPREFIX= v DISTVERSION= 9.0.0 +PORTREVISION= 1 CATEGORIES= lang devel MAINTAINER= arrowd@FreeBSD.org diff --git a/lang/dotnet-runtime/files/patch-bundled-libunwind b/lang/dotnet-runtime/files/patch-bundled-libunwind new file mode 100644 index 000000000000..224365ac72d0 --- /dev/null +++ b/lang/dotnet-runtime/files/patch-bundled-libunwind @@ -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}) diff --git a/lang/dotnet/Makefile b/lang/dotnet/Makefile index be2f965dde8c..03aa7e3bec90 100644 --- a/lang/dotnet/Makefile +++ b/lang/dotnet/Makefile @@ -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 diff --git a/lang/dotnet/files/patch-bundled-libunwind b/lang/dotnet/files/patch-bundled-libunwind new file mode 100644 index 000000000000..72082263884c --- /dev/null +++ b/lang/dotnet/files/patch-bundled-libunwind @@ -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})