From d007d265bd5449d6c8e5abd18f946b79ca9f31f7 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 21 Dec 2023 15:37:00 +0100 Subject: [PATCH] Fix the unwind-sys build on latest Fedora (#30906) The libunwind library version installed includes an rc number. The latest released version of the `unwind-sys` crate doesn't handle this properly, so rely on the latest commit in the upstream repository. --- Cargo.lock | 3 +-- components/background_hang_monitor/Cargo.toml | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6999ae4a511..05ba25d2880 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6446,8 +6446,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unwind-sys" version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554005b247de226d124a523cae6cd6a4348277071258296dda837cf760e02e7" +source = "git+https://github.com/sfackler/rstack?rev=bd0f3ec#bd0f3eceb9f086a93c1e4c5fbccf1f886effe627" dependencies = [ "libc", "pkg-config", diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml index 32cfbf93227..6af6df24a88 100644 --- a/components/background_hang_monitor/Cargo.toml +++ b/components/background_hang_monitor/Cargo.toml @@ -29,4 +29,6 @@ mach = "0.3" [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies] nix = "0.25" -unwind-sys = "0.1.1" +# There's a bug in 0.1.3 that prevent proper compilation against rc revisions +# of libunwind. Depend on the git repository version until 0.1.4 is released. +unwind-sys = { git = "https://github.com/sfackler/rstack", rev = "bd0f3ec" }