ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: cleanup LOCAL_SYS_LIBS for uuid

Browse Source 
LOCAL_SYS_LIBS is meant to define *direct* system
library dependencies for a given library.  libuuid
is directly used by the SPDK util library and then
other SPDK libraries use uuid indirectly through
util.

So only the util library should include uuid in
LOCAL_SYS_LIBS.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ia0d2d63f48e6f89891164cf2f9dc4c7a6476d4e3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4366
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Jim Harris 2020-09-23 22:38:47 +00:00 committed by Tomasz Zawadzki
parent 28af4daa0d
commit ed071dd9f9
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nvme/Makefile
View File

@ -43,7 +43,7 @@ C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c
C_SRCS-$(CONFIG_NVME_CUSE) += nvme_cuse.c C_SRCS-$(CONFIG_NVME_CUSE) += nvme_cuse.c
LIBNAME = nvme LIBNAME = nvme
LOCAL_SYS_LIBS = -luuid LOCAL_SYS_LIBS =
ifeq ($(CONFIG_RDMA),y) ifeq ($(CONFIG_RDMA),y)
LOCAL_SYS_LIBS += -libverbs -lrdmacm LOCAL_SYS_LIBS += -libverbs -lrdmacm
#Attach only if FreeBSD and RDMA is specified with configure #Attach only if FreeBSD and RDMA is specified with configure

2
lib/nvmf/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \
C_SRCS-$(CONFIG_RDMA) += rdma.c C_SRCS-$(CONFIG_RDMA) += rdma.c
LIBNAME = nvmf LIBNAME = nvmf
LOCAL_SYS_LIBS = -luuid LOCAL_SYS_LIBS =
ifeq ($(CONFIG_RDMA),y) ifeq ($(CONFIG_RDMA),y)
LOCAL_SYS_LIBS += -libverbs -lrdmacm LOCAL_SYS_LIBS += -libverbs -lrdmacm
#Attach only if FreeBSD and RDMA is specified with configure #Attach only if FreeBSD and RDMA is specified with configure

1
module/bdev/lvol/Makefile
View File

@ -39,7 +39,6 @@ SO_MINOR := 0
C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c
LIBNAME = bdev_lvol LIBNAME = bdev_lvol
LOCAL_SYS_LIBS = -luuid
SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map

1
module/bdev/malloc/Makefile
View File

@ -39,7 +39,6 @@ SO_MINOR := 0
C_SRCS = bdev_malloc.c bdev_malloc_rpc.c C_SRCS = bdev_malloc.c bdev_malloc_rpc.c
LIBNAME = bdev_malloc LIBNAME = bdev_malloc
LOCAL_SYS_LIBS = -luuid
SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map