From ed071dd9f96c47efe33bf1410a3a477c2742a2d9 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 23 Sep 2020 22:38:47 +0000 Subject: [PATCH] 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: Jim Harris Change-Id: Ia0d2d63f48e6f89891164cf2f9dc4c7a6476d4e3 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4366 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- lib/nvme/Makefile | 2 +- lib/nvmf/Makefile | 2 +- module/bdev/lvol/Makefile | 1 - module/bdev/malloc/Makefile | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index 9fe86c090..d64341b94 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -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 diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index 28861e6f4..13f72822c 100644 --- a/lib/nvmf/Makefile +++ b/lib/nvmf/Makefile @@ -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 diff --git a/module/bdev/lvol/Makefile b/module/bdev/lvol/Makefile index 37034593c..2bd34f64e 100644 --- a/module/bdev/lvol/Makefile +++ b/module/bdev/lvol/Makefile @@ -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 diff --git a/module/bdev/malloc/Makefile b/module/bdev/malloc/Makefile index c55db23ce..312ed0024 100644 --- a/module/bdev/malloc/Makefile +++ b/module/bdev/malloc/Makefile @@ -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