Unverified Commit 9bdc1d31 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

tbb_{2021_11,2022_0}: Fix build on Windows (#396676)

parents 110afff2 a8990441

pkgs/development/libraries/tbb/2022_0.nix

+10 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  fetchpatch,

  cmake,

  ninja,

}:



stdenv.mkDerivation rec {
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [

    cmake

    ninja

  ];



  patches = [
@@ -34,6 +36,11 @@ stdenv.mkDerivation rec { 
    })

  ];



  cmakeFlags = [

    # Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695

    (lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))

  ];



  # Fix build with modern gcc

  # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',

  NIX_CFLAGS_COMPILE =
@@ -61,6 +68,8 @@ stdenv.mkDerivation rec { 
      --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""

  '';



  enableParallelBuilding = true;



  meta = with lib; {

    description = "Intel Thread Building Blocks C++ Library";

    homepage = "http://threadingbuildingblocks.org/";
@@ -73,7 +82,7 @@ stdenv.mkDerivation rec { 
      represents a higher-level, task-based parallelism that abstracts platform

      details and threading mechanisms for scalability and performance.

    '';

    platforms = platforms.unix;

    platforms = platforms.unix ++ platforms.windows;

    maintainers = with maintainers; [

      thoughtpolice

      tmarkus

pkgs/development/libraries/tbb/default.nix

+20 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  fetchpatch,

  cmake,

  ninja,

}:



stdenv.mkDerivation rec {
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [

    cmake

    ninja

  ];



  patches = [
@@ -32,6 +34,21 @@ stdenv.mkDerivation rec { 
      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/899.patch";

      hash = "sha256-kU6RRX+sde0NrQMKlNtW3jXav6J4QiVIUmD50asmBPU=";

    })

    (fetchpatch {

      name = "fix-tbb-mingw-compile.patch";

      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1361.patch";

      hash = "sha256-jVa4HQetZv0vImdv549MyTy6/8t9dy8m6YAmjPGNQ18=";

    })

    (fetchpatch {

      name = "fix-tbb-mingw-link.patch";

      url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/1193.patch";

      hash = "sha256-ZQbwUmuIZoGVBof8QNR3V8vU385e2X7EvU3+Fbj4+M8=";

    })

  ];



  cmakeFlags = [

    # Skip tests to work around https://github.com/uxlfoundation/oneTBB/issues/1695

    (lib.cmakeBool "TBB_TEST" (!stdenv.hostPlatform.isWindows))

  ];



  # Fix build with modern gcc
@@ -61,6 +78,8 @@ stdenv.mkDerivation rec { 
      --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""

  '';



  enableParallelBuilding = true;



  meta = with lib; {

    description = "Intel Thread Building Blocks C++ Library";

    homepage = "http://threadingbuildingblocks.org/";
@@ -73,7 +92,7 @@ stdenv.mkDerivation rec { 
      represents a higher-level, task-based parallelism that abstracts platform

      details and threading mechanisms for scalability and performance.

    '';

    platforms = platforms.unix;

    platforms = platforms.unix ++ platforms.windows;

    maintainers = with maintainers; [

      thoughtpolice

      tmarkus