Unverified Commit 7012353d authored by Niklas Hambüchen's avatar Niklas Hambüchen Committed by GitHub
Browse files

Merge pull request #328847 from tobim/pkgs/ceph-fix-parallel-build 

ceph: Fix race in parallel build
parents d1bb31a4 63faf31b

pkgs/tools/filesystems/ceph/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -341,8 +341,6 @@ in rec { 
      graphviz

    ];



    enableParallelBuilding = true;



    buildInputs = cryptoLibsMap.${cryptoStr} ++ [

      arrow-cpp

      babeltrace
@@ -450,6 +448,14 @@ in rec { 
      ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''

    ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON";



    preBuild =

      # The legacy-option-headers target is not correctly empbedded in the build graph.

      # It also contains some internal race conditions that we work around by building with `-j 1`.

      # Upstream discussion for additional context at https://tracker.ceph.com/issues/63402.

      ''

        cmake --build . --target legacy-option-headers -j 1

      '';



    postFixup = ''

      wrapPythonPrograms

      wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"