Commit 5f6ef934 authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

mk/nvme/nvmf: Add deps for RDMA libs 



These dependencies were removed in patches that added
RDMA provider. It was incorrect change since it causes
SEGFAULT when SPDK is built with shared libraries

Change-Id: I15f4ff86a75b3d080e1c7c89d75af4959c4ed989
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2900


Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 0ebb0460

lib/nvme/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -44,6 +44,24 @@ C_SRCS-$(CONFIG_NVME_CUSE) += nvme_cuse.c 


LIBNAME = nvme

LOCAL_SYS_LIBS = -luuid

ifeq ($(CONFIG_RDMA),y)

LOCAL_SYS_LIBS += -libverbs -lrdmacm

#Attach only if FreeBSD and RDMA is specified with configure

ifeq ($(OS),FreeBSD)

# Mellanox - MLX4 HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libmlx4.*)","")

LOCAL_SYS_LIBS += -lmlx4

endif

# Mellanox - MLX5 HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libmlx5.*)","")

LOCAL_SYS_LIBS += -lmlx5

endif

# Chelsio HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libcxgb4.*)","")

LOCAL_SYS_LIBS += -lcxgb4

endif

endif

endif



ifeq ($(CONFIG_NVME_CUSE),y)

# fuse requires to set _FILE_OFFSET_BITS to 64 bits even for 64 bit machines

lib/nvmf/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -43,6 +43,24 @@ C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ 
C_SRCS-$(CONFIG_RDMA) += rdma.c

LIBNAME = nvmf

LOCAL_SYS_LIBS = -luuid

ifeq ($(CONFIG_RDMA),y)

LOCAL_SYS_LIBS += -libverbs -lrdmacm

#Attach only if FreeBSD and RDMA is specified with configure

ifeq ($(OS),FreeBSD)

# Mellanox - MLX4 HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libmlx4.*)","")

LOCAL_SYS_LIBS += -lmlx4

endif

# Mellanox - MLX5 HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libmlx5.*)","")

LOCAL_SYS_LIBS += -lmlx5

endif

# Chelsio HBA Userspace Library

ifneq ("$(wildcard /usr/lib/libcxgb4.*)","")

LOCAL_SYS_LIBS += -lcxgb4

endif

endif

endif



ifeq ($(CONFIG_FC),y)

C_SRCS += fc.c fc_ls.c