Fix GPI-2 using an unified rdma-core

The libraries and includes are no longer in the default output, so we
merge them in a single directory using symlinkJoin.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
This commit is contained in:
Rodrigo Arias 2023-11-21 16:55:47 +01:00
parent 4033854014
commit 501a92376b

View File

@ -1,5 +1,6 @@
{ {
stdenv stdenv
, symlinkJoin
, slurm , slurm
, rdma-core , rdma-core
, autoconf , autoconf
@ -10,6 +11,13 @@
, gfortran , gfortran
}: }:
let
rdma-core-all = symlinkJoin {
name ="rdma-core-all";
paths = [ rdma-core.dev rdma-core.out ];
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "GPI-2"; pname = "GPI-2";
version = src.shortRev; version = src.shortRev;
@ -28,14 +36,14 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--with-infiniband=${rdma-core}" "--with-infiniband=${rdma-core-all}"
"--with-mpi=${mpi}" "--with-mpi=${mpi}"
"--with-slurm" "--with-slurm"
"CFLAGS=-fPIC" "CFLAGS=-fPIC"
"CXXFLAGS=-fPIC" "CXXFLAGS=-fPIC"
]; ];
buildInputs = [ slurm mpi rdma-core autoconf automake libtool rsync gfortran ]; buildInputs = [ slurm mpi rdma-core-all autoconf automake libtool rsync gfortran ];
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
} }