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

build: cleanup LOCAL_SYS_LIBS for uuid 



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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ia0d2d63f48e6f89891164cf2f9dc4c7a6476d4e3
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4366


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 28af4daa

lib/nvme/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c 
C_SRCS-$(CONFIG_NVME_CUSE) += nvme_cuse.c



LIBNAME = nvme

LOCAL_SYS_LIBS = -luuid

LOCAL_SYS_LIBS =

ifeq ($(CONFIG_RDMA),y)

LOCAL_SYS_LIBS += -libverbs -lrdmacm

#Attach only if FreeBSD and RDMA is specified with configure

lib/nvmf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ 


C_SRCS-$(CONFIG_RDMA) += rdma.c

LIBNAME = nvmf

LOCAL_SYS_LIBS = -luuid

LOCAL_SYS_LIBS =

ifeq ($(CONFIG_RDMA),y)

LOCAL_SYS_LIBS += -libverbs -lrdmacm

#Attach only if FreeBSD and RDMA is specified with configure

module/bdev/lvol/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ SO_MINOR := 0 


C_SRCS = vbdev_lvol.c vbdev_lvol_rpc.c

LIBNAME = bdev_lvol

LOCAL_SYS_LIBS = -luuid



SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map

module/bdev/malloc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ SO_MINOR := 0 


C_SRCS = bdev_malloc.c bdev_malloc_rpc.c

LIBNAME = bdev_malloc

LOCAL_SYS_LIBS = -luuid



SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map