Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libunwind: 1.4.0 -> 1.6.2 #147665

Merged
merged 1 commit into from
Dec 3, 2021
Merged

libunwind: 1.4.0 -> 1.6.2 #147665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
View file
Open in desktop

This file was deleted.

18 changes: 4 additions & 14 deletions pkgs/development/libraries/libunwind/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }:
{ stdenv, lib, fetchurl, autoreconfHook, xz, coreutils }:

stdenv.mkDerivation rec {
pname = "libunwind";
version = "1.4.0";
version = "1.6.2";

src = fetchurl {
url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz";
sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY=";
};

patches = [
./backtrace-only-with-glibc.patch

(fetchpatch {
# upstream build fix against -fno-common compilers like >=gcc-10
url = "https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e.patch";
sha256 = "1angwfq6h0jskg6zx8g6w9min38g5mgmrcbppcy5hqn59cgsxbw0";
})
];

postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh"
'';
Expand Down Expand Up @@ -46,7 +36,7 @@ stdenv.mkDerivation rec {
description = "A portable and efficient API to determine the call-chain of a program";
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
badPlatforms = [ "riscv32-linux" "riscv64-linux" ];
badPlatforms = [ "riscv32-linux" ];
license = licenses.mit;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18425,7 +18425,7 @@ with pkgs;

libunwind =
if stdenv.isDarwin then darwin.libunwind
else if stdenv.hostPlatform.isRiscV then llvmPackages_latest.libunwind
else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_latest.libunwind
else callPackage ../development/libraries/libunwind { };

libuv = callPackage ../development/libraries/libuv {
Expand Down