From 9539edca023161979bbf7fdc7db56e29493faef6 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 21 Jun 2018 16:38:56 -0700 Subject: [PATCH] build: add sock dependency for all NVMe lib users This will be necessary when the NVMe/TCP transport is added, which will use the sock abstraction library. Change-Id: I6561ccdad1ff575db2afa418eab2f2cd24806cb9 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/416477 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker --- app/nvmf_tgt/Makefile | 3 ++- examples/bdev/hello_world/Makefile | 4 ++-- examples/blob/cli/Makefile | 4 ++-- examples/blob/hello_world/Makefile | 4 ++-- mk/nvme.libtest.mk | 4 +++- mk/spdk.unittest.mk | 2 +- test/app/bdev_svc/Makefile | 3 ++- test/app/stub/Makefile | 4 +++- test/bdev/bdevio/Makefile | 5 +++-- test/bdev/bdevperf/Makefile | 5 +++-- test/blobfs/mkfs/Makefile | 4 ++-- 11 files changed, 25 insertions(+), 17 deletions(-) diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index f24fa3296..e93ed1bf0 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -50,12 +50,13 @@ endif LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \ + $(SOCK_MODULES_LINKER_ARGS) \ $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile index dc85b27d1..dacc1b81b 100644 --- a/examples/bdev/hello_world/Makefile +++ b/examples/bdev/hello_world/Makefile @@ -41,13 +41,13 @@ C_SRCS := hello_bdev.c SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc -LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) +LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile index c733ba626..7796c40f1 100644 --- a/examples/blob/cli/Makefile +++ b/examples/blob/cli/Makefile @@ -42,13 +42,13 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \ log jsonrpc json rpc -LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS) +LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_NO_LVOL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_NO_LVOL_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile index 9ece8c044..7c567fcb0 100644 --- a/examples/blob/hello_world/Makefile +++ b/examples/blob/hello_world/Makefile @@ -42,13 +42,13 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \ log jsonrpc json rpc -LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) +LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk index f6da77a03..acaa13401 100644 --- a/mk/nvme.libtest.mk +++ b/mk/nvme.libtest.mk @@ -35,11 +35,13 @@ NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk +include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk C_SRCS = $(APP:%=%.c) SPDK_LIB_LIST = nvme thread util log +LIBS += $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) ifeq ($(CONFIG_RDMA),y) @@ -49,7 +51,7 @@ endif all: $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SOCK_MODULES_FILES) $(SPDK_LIB_FILES) $(ENV_LIBS) $(LINK_C) clean: diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk index df5afe383..d30a90edb 100644 --- a/mk/spdk.unittest.mk +++ b/mk/spdk.unittest.mk @@ -40,7 +40,7 @@ C_SRCS = $(TEST_FILE) CFLAGS += -I$(SPDK_ROOT_DIR)/lib CFLAGS += -I$(SPDK_ROOT_DIR)/test -SPDK_LIB_LIST += thread util log spdk_mock +SPDK_LIB_LIST += thread util log spdk_mock sock LIBS += -lcunit $(SPDK_LIB_LINKER_ARGS) diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index 6337cb2c2..43ec095ac 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -50,12 +50,13 @@ endif LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \ + $(SOCK_MODULES_LINKER_ARGS) \ $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile index 774097495..015a2e6e7 100644 --- a/test/app/stub/Makefile +++ b/test/app/stub/Makefile @@ -34,6 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk +include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = stub @@ -41,6 +42,7 @@ C_SRCS := stub.c SPDK_LIB_LIST = event conf nvme log trace rpc jsonrpc json thread util +LIBS += $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS) @@ -51,7 +53,7 @@ endif all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SOCK_MODULES_FILES) $(SPDK_LIB_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile index eaf233f82..d973846f6 100644 --- a/test/bdev/bdevio/Makefile +++ b/test/bdev/bdevio/Makefile @@ -44,14 +44,15 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ - $(COPY_MODULES_LINKER_ARGS) + $(COPY_MODULES_LINKER_ARGS) \ + $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) -lcunit all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(SOCK_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile index 5e45b4cbf..eb5f76aef 100644 --- a/test/bdev/bdevperf/Makefile +++ b/test/bdev/bdevperf/Makefile @@ -44,14 +44,15 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ - $(COPY_MODULES_LINKER_ARGS) + $(COPY_MODULES_LINKER_ARGS) \ + $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(SOCK_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile index b2b192e23..8367571e5 100644 --- a/test/blobfs/mkfs/Makefile +++ b/test/blobfs/mkfs/Makefile @@ -44,13 +44,13 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += blobfs blob bdev blob_bdev copy event thread util conf trace \ log jsonrpc json rpc -LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) +LIBS += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(SOCK_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean :