From 6005fdba84fc1bcc4be6da3d784ac780cf212c4a Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 20 Nov 2018 14:07:55 -0700 Subject: [PATCH] build: add missing xx_MODULES_LINKER_ARGS There were several applications that were missing either SOCK_MODULES_LINKER_ARGS or COPY_MODULES_LINKER_ARGS. For the ones missing SOCK_MODULES_LINKER_ARGS (fuse and rocksdb), the nvme inititator with TCP transport would not have worked at all. Adding COPY_MODULES_LINKER_ARGS to the bdev fio plugin enables ioat which isn't critical, but adding it makes it consistent with other apps and will allow its Makefile to be simplified in some future patches. Signed-off-by: Jim Harris Change-Id: I0098350d75d27ad2b2d408221b727698f5e902e4 Reviewed-on: https://review.gerrithub.io/434260 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto --- examples/bdev/fio_plugin/Makefile | 1 + lib/rocksdb/spdk.rocksdb.mk | 1 + test/blobfs/fuse/Makefile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile index 2be633ac7..c31839159 100644 --- a/examples/bdev/fio_plugin/Makefile +++ b/examples/bdev/fio_plugin/Makefile @@ -46,6 +46,7 @@ LDFLAGS += -shared -rdynamic SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) $(SOCK_MODULES_LINKER_ARGS) +LIBS += $(COPY_MODULES_LINKER_ARGS) LIBS += $(SPDK_LIB_LINKER_ARGS) all: $(APP) diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk index ba86615ab..c4a9b1ef6 100644 --- a/lib/rocksdb/spdk.rocksdb.mk +++ b/lib/rocksdb/spdk.rocksdb.mk @@ -57,6 +57,7 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event util conf trace log jsonrpc json rpc sock thread AM_LINK += $(COPY_MODULES_LINKER_ARGS) $(BLOCKDEV_MODULES_LINKER_ARGS) +AM_LINK += $(SOCK_MODULES_LINKER_ARGS) AM_LINK += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) AM_LINK += $(SYS_LIBS) diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile index 9d1b4a972..541f6016c 100644 --- a/test/blobfs/fuse/Makefile +++ b/test/blobfs/fuse/Makefile @@ -44,7 +44,7 @@ SPDK_LIB_LIST = event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace \ log jsonrpc json rpc sock -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) LIBS+= -L/usr/local/lib -lfuse3