From nobody Thu Feb 06 18:32:13 2025 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 4Ypm0s4p0Xz5mrlJ; Thu, 06 Feb 2025 18:32:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ypm0s4FClz3pQZ; Thu, 06 Feb 2025 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738866733; 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=NhLDbIO/72lGMh9i1fIKPwOR+VBgueMlYkaeUGV5r1w=; b=YsGLZ0zkgZOBCl8pOatZSOIVhlYcvrk9H+2q+6wf359Y732ap6QTaTrtYpUiphk8DbpHK+ WhjI1c0I0FDk4xnPloRvyYjwJCBMnb/2+TiLyjIXDUlSwbyPWq5Fd+U2NBClQBUBWWmwHW XdjWEAUeBhnPyKwmczNM6io2dqbUucZ8oXgzOe/0FYKZ9pKmjomoaJ+qbR9M5/jjRVcaJq wtyhx16wFdOhXrqev1Kp/LdUOHLXqWC8w3fNUN3BGaiJ42KPc9HQfG/V2PtKkxGAkYuZ8S 0v7jajRUG+1TNGjmDOHAS9AixKd5w1pdsh69Sv62/GTxP0Icv9p/nhdI56CrwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738866733; 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=NhLDbIO/72lGMh9i1fIKPwOR+VBgueMlYkaeUGV5r1w=; b=T8cPqvfXQRssNoMXGbWSv1lx+FaSNEH3VOiv1ojV5Q1AwSKNVMNrl31WSWUFO/JkhvdVV4 PUMVSpL5PWswkvMyXnrB/4sEg/jwY1pbHZ2o0E/tJ1rFKA3J6l+PNrDIFsw/IxbuyWLihx uH9NNZ2/XgnMisT3Fki3KDVUjdyQGTMbOj2UOWRBcEIHdLSNShz4V9VM+ruYhYS8JQOBcC Jnw7GIY0QCiWUELJcvMTeb6Nb31qxi1e5ZHSe1ushwekPaH1AawXADAu5UBa5UhFbSNAmC vpHBsaBPEk72GYs92tTIajFn7L/2G4l7amSYwOMAepQAWjGwFfBhoAn/BHqSfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738866733; a=rsa-sha256; cv=none; b=rnghRQNwifYxsi3T19bGEEyY3aa84zQw0SN+st0FjsKRqIyzoyPVcWQJ/iS6Q5xd15GRca z5wjwM8gapQNyFFn8XtnQLMaxo0nB8+dGT7PdEEGvgi6jZya7qbAVND2odDynPN3iJYiXK duXWWjVaA9oZRtj9MNu9eylK5g1NyX7kztMOvMP7tiQhTdfRi231Sakz0rOEjVpekF4szx zoFowuvU94ea0h7W1V5KIGCbvYQtCVuf4ioWjb9jYEEE9SJEMMQekSVGr13u8+xaL7oZiy I/JTJ8dUkRrkf9KXOvBFkgSh65uebLRnXIa/8XzsmS7OA/CYmQg767DndAQ+dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ypm0s3qC7zq5B; Thu, 06 Feb 2025 18:32:13 +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 516IWDcQ036658; Thu, 6 Feb 2025 18:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516IWDE2036655; Thu, 6 Feb 2025 18:32:13 GMT (envelope-from git) Date: Thu, 6 Feb 2025 18:32:13 GMT Message-Id: <202502061832.516IWDE2036655@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: 95bcd42a132b - main - lang/dotnet[-runtime]: Revert "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: 95bcd42a132b4a35ae06b5bc858e33c0f725710a Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=95bcd42a132b4a35ae06b5bc858e33c0f725710a commit 95bcd42a132b4a35ae06b5bc858e33c0f725710a Author: Gleb Popov AuthorDate: 2025-02-06 18:26:41 +0000 Commit: Gleb Popov CommitDate: 2025-02-06 18:31:51 +0000 lang/dotnet[-runtime]: Revert "Use bundled libunwind in hope to avoiding random crashes" The bundled libunwind performs no better and even worse, it seems. This reverts commit 6a69e4b5a8b407997e620cfe4e2b969cf274de9e. --- lang/dotnet-runtime/Makefile | 1 + lang/dotnet-runtime/files/patch-bundled-libunwind | 42 ----------------------- lang/dotnet/Makefile | 1 + lang/dotnet/files/patch-bundled-libunwind | 42 ----------------------- 4 files changed, 2 insertions(+), 84 deletions(-) diff --git a/lang/dotnet-runtime/Makefile b/lang/dotnet-runtime/Makefile index 88474a6474f1..26c4f6acc5e7 100644 --- a/lang/dotnet-runtime/Makefile +++ b/lang/dotnet-runtime/Makefile @@ -1,6 +1,7 @@ PORTNAME= dotnet-host DISTVERSIONPREFIX= v DISTVERSION= 9.0.1 +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 deleted file mode 100644 index 224365ac72d0..000000000000 --- a/lang/dotnet-runtime/files/patch-bundled-libunwind +++ /dev/null @@ -1,42 +0,0 @@ -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 1f8ad574c065..51e2f3725fd5 100644 --- a/lang/dotnet/Makefile +++ b/lang/dotnet/Makefile @@ -1,6 +1,7 @@ PORTNAME= dotnet DISTVERSIONPREFIX= v DISTVERSION= ${DOTNETVERSION}.1 +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/9.0.0-rc.2-native/:bootstrap diff --git a/lang/dotnet/files/patch-bundled-libunwind b/lang/dotnet/files/patch-bundled-libunwind deleted file mode 100644 index 72082263884c..000000000000 --- a/lang/dotnet/files/patch-bundled-libunwind +++ /dev/null @@ -1,42 +0,0 @@ -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})