Commit 8f92bde4 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

build: add PRIVATE_LIBS variables for module lists 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I8e7f8af56b494a9c578cd0eeb718fe6a42deb542
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4469


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent ec02743a

mk/spdk.modules.mk

+10 −9
Original line number Diff line number Diff line
@@ -47,48 +47,48 @@ endif 


ifeq ($(CONFIG_REDUCE),y)

BLOCKDEV_MODULES_LIST += bdev_compress reduce

SYS_LIBS += -lpmem

BLOCKDEV_MODULES_PRIVATE_LIBS += -lpmem

endif



ifeq ($(CONFIG_RDMA),y)

BLOCKDEV_MODULES_LIST += rdma

SYS_LIBS += -libverbs -lrdmacm

BLOCKDEV_MODULES_PRIVATE_LIBS += -libverbs -lrdmacm

ifeq ($(CONFIG_RDMA_PROV),mlx5_dv)

SYS_LIBS += -lmlx5

BLOCKDEV_MODULES_PRIVATE_LIBS += -lmlx5

endif

endif



ifeq ($(OS),Linux)

BLOCKDEV_MODULES_LIST += bdev_ftl ftl

BLOCKDEV_MODULES_LIST += bdev_aio

SYS_LIBS += -laio

BLOCKDEV_MODULES_PRIVATE_LIBS += -laio

ifeq ($(CONFIG_VIRTIO),y)

BLOCKDEV_MODULES_LIST += bdev_virtio virtio

endif

ifeq ($(CONFIG_ISCSI_INITIATOR),y)

BLOCKDEV_MODULES_LIST += bdev_iscsi

# Fedora installs libiscsi to /usr/lib64/iscsi for some reason.

SYS_LIBS += -L/usr/lib64/iscsi -liscsi

BLOCKDEV_MODULES_PRIVATE_LIBS += -L/usr/lib64/iscsi -liscsi

endif

endif



ifeq ($(CONFIG_URING),y)

BLOCKDEV_MODULES_LIST += bdev_uring

SYS_LIBS += -luring

BLOCKDEV_MODULES_PRIVATE_LIBS += -luring

ifneq ($(strip $(CONFIG_URING_PATH)),)

CFLAGS += -I$(CONFIG_URING_PATH)

LDFLAGS += -L$(CONFIG_URING_PATH)

BLOCKDEV_MODULES_PRIVATE_LIBS += -L$(CONFIG_URING_PATH)

endif

endif



ifeq ($(CONFIG_RBD),y)

BLOCKDEV_MODULES_LIST += bdev_rbd

SYS_LIBS += -lrados -lrbd

BLOCKDEV_MODULES_PRIVATE_LIBS += -lrados -lrbd

endif



ifeq ($(CONFIG_PMDK),y)

BLOCKDEV_MODULES_LIST += bdev_pmem

SYS_LIBS += -lpmemblk -lpmem

BLOCKDEV_MODULES_PRIVATE_LIBS += -lpmemblk -lpmem

endif



SOCK_MODULES_LIST = sock_posix
@@ -107,3 +107,4 @@ endif 
EVENT_BDEV_SUBSYSTEM = event_bdev event_accel event_vmd event_sock



ALL_MODULES_LIST = $(BLOCKDEV_MODULES_LIST) $(ACCEL_MODULES_LIST) $(SOCK_MODULES_LIST)

SYS_LIBS += $(BLOCKDEV_MODULES_PRIVATE_LIBS)