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

Merge pull request #303448 from ExpidusOS/feat/llvm-git-commonify-openmp 

llvmPackages_{12,13,14,15,16,17,18,git}: use common openmp
parents 764fb619 8c71431f

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

+10 −1
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake

, preLibcCrossHeaders

, fetchpatch

, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -264,7 +265,15 @@ let 
      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };



    openmp = callPackage ./openmp {

    openmp = callPackage ../common/openmp {

      src = fetch "openmp" "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0";

      patches = [

        # Fix cross.

        (fetchpatch {

          url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

          hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

        })

      ];

      inherit llvm_meta targetLlvm;

    };

  });

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

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
{ lib

, stdenv

, llvm_meta

, fetch

, fetchpatch

, cmake

, llvm

, targetLlvm

, perl

, version

}:



stdenv.mkDerivation rec {

  pname = "openmp";

  inherit version;



  src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0";



  patches = [

    # Fix cross.

    (fetchpatch {

      url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

      hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

    })

  ];



  patchFlags = [ "-p2" ];



  nativeBuildInputs = [ cmake perl ];

  buildInputs = [

    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

  ];



  meta = llvm_meta // {

    homepage = "https://openmp.llvm.org/";

    description = "Support for the OpenMP language";

    longDescription = ''

      The OpenMP subproject of LLVM contains the components required to build an

      executable OpenMP program that are outside the compiler itself.

      Contains the code for the runtime library against which code compiled by

      "clang -fopenmp" must be linked before it can run and the library that

      supports offload to target devices.

    '';

    # "All of the code is dual licensed under the MIT license and the UIUC

    # License (a BSD-like license)":

    license = with lib.licenses; [ mit ncsa ];

  };

}

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

+9 −1
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake

, preLibcCrossHeaders

, fetchpatch

, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -301,7 +302,14 @@ in let 
      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };



    openmp = callPackage ./openmp {

    openmp = callPackage ../common/openmp {

      patches = [

        # Fix cross.

        (fetchpatch {

          url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

          hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

        })

      ];

      inherit llvm_meta targetLlvm;

    };

  });

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

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
{ lib

, stdenv

, llvm_meta

, src

, fetchpatch

, cmake

, llvm

, targetLlvm

, perl

, version

}:



stdenv.mkDerivation rec {

  pname = "openmp";

  inherit version;



  inherit src;

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



  patches = [

    # Fix cross.

    (fetchpatch {

      url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

      hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

    })

  ];



  patchFlags = [ "-p2" ];



  nativeBuildInputs = [ cmake perl ];

  buildInputs = [

    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

  ];



  cmakeFlags = [

    "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails

  ];



  meta = llvm_meta // {

    homepage = "https://openmp.llvm.org/";

    description = "Support for the OpenMP language";

    longDescription = ''

      The OpenMP subproject of LLVM contains the components required to build an

      executable OpenMP program that are outside the compiler itself.

      Contains the code for the runtime library against which code compiled by

      "clang -fopenmp" must be linked before it can run and the library that

      supports offload to target devices.

    '';

    # "All of the code is dual licensed under the MIT license and the UIUC

    # License (a BSD-like license)":

    license = with lib.licenses; [ mit ncsa ];

  };

}

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

+5 −1
Original line number Diff line number Diff line
@@ -299,7 +299,11 @@ in let 
      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;

    };



    openmp = callPackage ./openmp {

    openmp = callPackage ../common/openmp {

      patches = [

        ./openmp/gnu-install-dirs.patch

        ./openmp/run-lit-directly.patch

      ];

      inherit llvm_meta targetLlvm;

    };

  });