Commit 2dfa67b5 authored by Xiangyan Sun's avatar Xiangyan Sun
Browse files

frawk: fix build

parent 1fac383e

pkgs/by-name/fr/frawk/fix-prefetch-read-data.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/src/runtime/splitter/batch.rs b/src/runtime/splitter/batch.rs

index 9b1bc21..d7eeaa0 100644

--- a/src/runtime/splitter/batch.rs

+++ b/src/runtime/splitter/batch.rs

@@ -1137,7 +1137,7 @@ mod generic {

         macro_rules! iterate {

             ($buf:expr) => {{

                 #[cfg(feature = "unstable")]

-                std::intrinsics::prefetch_read_data($buf.offset(128), 3);

+                std::intrinsics::prefetch_read_data::<_, 3>($buf.offset(128));

                 let (s, mask, nl) = f(state, $buf);

                 state = s;

                 (mask, nl)

pkgs/by-name/fr/frawk/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  cargoHash = "sha256-VraFR3Mp4mPh+39hw88R0q1p5iNkcQzvhRVNPwSxzU0=";



  patches = [

    # This patch comes from https://github.com/ezrosent/frawk/pull/120, which was squash-merged.

    # Remove these two patches after frawk is updated to a version including this fix

    # This patch comes from https://github.com/ezrosent/frawk/pull/120

    ./fix-some-compiler-warnings-errors.patch

    # From https://github.com/ezrosent/frawk/commit/35a79dc04933f38f98a7c8f6fc89ca09724702ab

    ./fix-prefetch-read-data.patch

  ];



  buildInputs = [