Commit 3f38382c authored by Jim Harris's avatar Jim Harris
Browse files

build: fix some library dependencies 



Upcoming patches from Lance Hartmann have pointed out
some places where the library lists should be
reordered to enable linking with shared libraries
without building dependencies into the shared
libraries themselves.  We will build these dependencies
into the shared libraries at some point, but these
patches let us defer that for a bit.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I7b838ce171db723d8408b974731b357bbc098080

Reviewed-on: https://review.gerrithub.io/422438


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 9ee49421

app/iscsi_tgt/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib 


C_SRCS := iscsi_tgt.c



SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi

SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev iscsi scsi copy trace conf

SPDK_LIB_LIST += thread util log log_rpc event app_rpc net

SPDK_LIB_LIST += thread util log log_rpc app_rpc net



ifeq ($(OS),Linux)

SPDK_LIB_LIST += event_nbd nbd

app/spdk_tgt/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ APP = spdk_tgt 


C_SRCS := spdk_tgt.c



SPDK_LIB_LIST = event_bdev event_copy event_iscsi event_net event_scsi event_nvmf

SPDK_LIB_LIST += nvmf event log trace conf thread util bdev iscsi scsi copy rpc jsonrpc json

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 += app_rpc log_rpc bdev_rpc net



ifeq ($(OS),Linux)

app/vhost/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ APP = vhost 


C_SRCS := vhost.c



SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost

SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost event

SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf

SPDK_LIB_LIST += thread util log log_rpc event app_rpc

SPDK_LIB_LIST += thread util log log_rpc app_rpc

SPDK_LIB_LIST += vhost rte_vhost event_nbd nbd net



LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \