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

spdk_tgt, vhost: move vhost libraries earlier in SPDK_LIB_LIST

Browse Source 
Upcoming changes will use --whole-archive on all libraries.  This
introduces some issues with the shared library builds, although
it's not entirely clear why these issues don't occur today.

vhost depends on both scsi and bdev - but for the spdk_tgt and
vhost application Makefiles, vhost is listed later than scsi
and bdev.  It's best practice to list the libraries in order
of dependence - at least until we add dependencies to the shared
libraries themselves.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ibacfb7781dad60cf3ce6906deaaa2e5c0f5e9571

Reviewed-on: https://review.gerrithub.io/433356
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
Jim Harris 2018-11-14 08:51:13 -07:00 committed by Darek Stojaczyk
parent bf7f87cecd
commit e0b669312a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/spdk_tgt/Makefile
View File

@ -40,17 +40,20 @@ APP = spdk_tgt
C_SRCS := spdk_tgt.c C_SRCS := spdk_tgt.c
SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event SPDK_LIB_LIST =
ifeq ($(OS),Linux)
ifeq ($(CONFIG_VHOST),y)
SPDK_LIB_LIST += vhost rte_vhost event_vhost
endif
endif
SPDK_LIB_LIST += event_bdev event_copy event_iscsi event_net event_scsi event_nvmf event
SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json SPDK_LIB_LIST += nvmf trace log conf thread util bdev iscsi scsi copy rpc jsonrpc json
SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net SPDK_LIB_LIST += app_rpc log_rpc bdev_rpc net
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
ifeq ($(CONFIG_VHOST),y)
SPDK_LIB_LIST += vhost rte_vhost event_vhost
endif
endif endif
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

5
app/vhost/Makefile
View File

@ -40,10 +40,11 @@ APP = vhost
C_SRCS := vhost.c C_SRCS := vhost.c
SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost event SPDK_LIB_LIST = vhost rte_vhost event_vhost
SPDK_LIB_LIST += event_bdev event_copy event_net event_scsi event
SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf
SPDK_LIB_LIST += thread util log log_rpc app_rpc SPDK_LIB_LIST += thread util log log_rpc app_rpc
SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd net SPDK_LIB_LIST += event_nbd nbd net
LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \
$(COPY_MODULES_LINKER_ARGS) \ $(COPY_MODULES_LINKER_ARGS) \