Unverified Commit ded11d6f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #303447 from ExpidusOS/feat/llvm-git-commonify-libunwind 

llvmPackages_{12,13,14,15,16,17,18,git}: use common libunwind
parents da09de0e ae92b08f

pkgs/development/compilers/llvm/12/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -259,9 +259,12 @@ let 
      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };



    libunwind = callPackage ./libunwind {

    libunwind = callPackage ../common/libunwind {

      src = fetch "libunwind" "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb";

      patches = [

        ./libunwind/gnu-install-dirs.patch

      ];

      inherit llvm_meta;

      inherit (buildLlvmTools) llvm;

      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };

pkgs/development/compilers/llvm/12/libunwind/default.nix

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, version, fetch, libcxx, llvm, cmake

, enableShared ? !stdenv.hostPlatform.isStatic

}:



stdenv.mkDerivation rec {

  pname = "libunwind";

  inherit version;



  src = fetch pname "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb";



  postUnpack = ''

    ln -s ${libcxx.src}/libcxx .

    ln -s ${libcxx.src}/llvm .

  '';



  patches = [

    ./gnu-install-dirs.patch

  ];



  outputs = [ "out" "dev" ];



  nativeBuildInputs = [ cmake ];



  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";



  meta = llvm_meta // {

    # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst

    homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library";

    description = "LLVM's unwinder library";

    longDescription = ''

      The unwind library provides a family of _Unwind_* functions implementing

      the language-neutral stack unwinding portion of the Itanium C++ ABI (Level

      I). It is a dependency of the C++ ABI library, and sometimes is a

      dependency of other runtimes.

    '';

  };

}

pkgs/development/compilers/llvm/13/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -297,7 +297,10 @@ in let 
      monorepoSrc = src;

    };



    libunwind = callPackage ./libunwind {

    libunwind = callPackage ../common/libunwind {

      patches = [

        ./libunwind/gnu-install-dirs.patch

      ];

      inherit llvm_meta;

      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };

pkgs/development/compilers/llvm/13/libunwind/default.nix

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, version, src, cmake

, enableShared ? !stdenv.hostPlatform.isStatic

}:



stdenv.mkDerivation rec {

  pname = "libunwind";

  inherit version;



  inherit src;

  sourceRoot = "${src.name}/${pname}";



  patches = [

    ./gnu-install-dirs.patch

  ];



  outputs = [ "out" "dev" ];



  nativeBuildInputs = [ cmake ];



  cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";



  meta = llvm_meta // {

    # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst

    homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library";

    description = "LLVM's unwinder library";

    longDescription = ''

      The unwind library provides a family of _Unwind_* functions implementing

      the language-neutral stack unwinding portion of the Itanium C++ ABI (Level

      I). It is a dependency of the C++ ABI library, and sometimes is a

      dependency of other runtimes.

    '';

  };

}

pkgs/development/compilers/llvm/14/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -294,7 +294,10 @@ in let 
      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };



    libunwind = callPackage ./libunwind {

    libunwind = callPackage ../common/libunwind {

      patches = [

        ./libunwind/gnu-install-dirs.patch

      ];

      inherit llvm_meta;

      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };