Skip to content

Commit

Permalink
chore: compat finangling
Browse files Browse the repository at this point in the history
Signed-off-by: Ana Hobden <[email protected]>
  • Loading branch information
Hoverbear committed Feb 23, 2021
1 parent a97175e commit 6437643
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions nix/pkgs/libspdk/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
, numactl
, openssl
, python3
, stdenv
, stdenv
, system ? builtins.currentSystem
}:
let
Expand Down Expand Up @@ -53,17 +53,18 @@ let
configureFlags = (if (system == "x86_64-linux") then
[
"--target-arch=nehalem"
"--with-crypto"
]
else if (system == "aarch64-linux") then
[
"--target-arch=armv8-a+crypto"
]
else
[]
) ++ [
#"--with-crypto"
"--without-isal"
"--with-iscsi-initiator"
"--with-uring"
"--disable-examples"
"--disable-unit-tests"
"--disable-tests"
];

enableParallelBuilding = true;
Expand All @@ -73,7 +74,7 @@ let
'';

configurePhase = ''
patchShebangs ./.
patchShebangs ./. > /dev/null
./configure $configureFlags
'';

Expand Down
4 changes: 2 additions & 2 deletions spdk-sys/logwrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

void
maya_log(int level, const char *file, const int line, const char *func,
const char *format, va_list *args)
const char *format, va_list args)
{
char buf[1024] = {0};
int n_written = vsnprintf(buf, sizeof(buf), format, *args);
int n_written = vsnprintf(buf, sizeof(buf), format, args);
logfn(level, file, line, func, &buf[0], n_written);
}

0 comments on commit 6437643

Please sign in to comment.