Commit 2c5b956e authored by Jim Harris's avatar Jim Harris
Browse files

mk: add spdk_lib_list_to_shared_libs 



While here, change spdk_lib_list_to_files to
spdk_lib_list_to_static_libs to differentiate it from
the new spdk_lib_list_to_shared_libs.

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

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


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

lib/env_dpdk/env.mk

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ endif 
# SPDK memory registration requires experimental (deprecated) rte_memory API for DPDK 18.05

ENV_CFLAGS = $(DPDK_INC) -Wno-deprecated-declarations

ENV_CXXFLAGS = $(ENV_CFLAGS)

ENV_DPDK_FILE = $(call spdk_lib_list_to_files,env_dpdk)

ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)

ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB)

ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--whole-archive $(DPDK_LIB) -Wl,--no-whole-archive

mk/spdk.app.mk

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ SPDK_FILTER_LIB_LIST += $(filter spdk_mock,$(SPDK_LIB_LIST)) 
SPDK_WHOLE_ARCHIVE_LIB_LIST = $(SPDK_FILTER_LIB_LIST)

SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_WHOLE_ARCHIVE_LIB_LIST),$(SPDK_LIB_LIST))



SPDK_LIB_FILES = $(call spdk_lib_list_to_files,$(SPDK_LIB_LIST))

SPDK_LIB_FILES = $(call spdk_lib_list_to_static_libs,$(SPDK_LIB_LIST))

SPDK_LIB_LINKER_ARGS = \

	-L$(SPDK_ROOT_DIR)/build/lib \

	-Wl,--whole-archive \

mk/spdk.common.mk

+5 −1
Original line number Diff line number Diff line
@@ -291,6 +291,10 @@ INSTALL_HEADER=\ 


%.d: ;



define spdk_lib_list_to_files

define spdk_lib_list_to_static_libs

$(1:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a)

endef



define spdk_lib_list_to_shared_libs

$(1:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.so)

endef

mk/spdk.lib.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map

LIB := $(call spdk_lib_list_to_files,$(LIBNAME))

LIB := $(call spdk_lib_list_to_static_libs,$(LIBNAME))

SHARED_LINKED_LIB := $(subst .a,.so,$(LIB))

SHARED_REALNAME_LIB := $(subst .so,.so.$(SO_SUFFIX_ALL),$(SHARED_LINKED_LIB))

mk/spdk.modules.mk

+4 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ BLOCKDEV_MODULES_LINKER_ARGS = -Wl,--whole-archive \ 
			       -Wl,--no-whole-archive \

			       $(BLOCKDEV_MODULES_DEPS)



BLOCKDEV_MODULES_FILES = $(call spdk_lib_list_to_files,$(BLOCKDEV_MODULES_LIST))

BLOCKDEV_MODULES_FILES = $(call spdk_lib_list_to_static_libs,$(BLOCKDEV_MODULES_LIST))



BLOCKDEV_NO_LVOL_MODULES_LIST = $(filter-out $(LVOL_MODULES_LIST),$(BLOCKDEV_MODULES_LIST))

BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS = -Wl,--whole-archive \
@@ -98,18 +98,18 @@ BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS = -Wl,--whole-archive \ 
			       -Wl,--no-whole-archive \

			       $(BLOCKDEV_MODULES_DEPS)



BLOCKDEV_NO_LVOL_MODULES_FILES = $(call spdk_lib_list_to_files,$(BLOCKDEV_NO_LVOL_MODULES_LIST))

BLOCKDEV_NO_LVOL_MODULES_FILES = $(call spdk_lib_list_to_static_libs,$(BLOCKDEV_NO_LVOL_MODULES_LIST))



COPY_MODULES_LINKER_ARGS = -Wl,--whole-archive \

			   $(COPY_MODULES_LIST:%=-lspdk_%) \

			   -Wl,--no-whole-archive \

			   $(COPY_MODULES_DEPS)



COPY_MODULES_FILES = $(call spdk_lib_list_to_files,$(COPY_MODULES_LIST))

COPY_MODULES_FILES = $(call spdk_lib_list_to_static_libs,$(COPY_MODULES_LIST))



SOCK_MODULES_LINKER_ARGS = -Wl,--whole-archive \

			   $(SOCK_MODULES_LIST:%=-lspdk_%) \

			   $(SOCK_MODULES_DEPS) \

			   -Wl,--no-whole-archive



SOCK_MODULES_FILES = $(call spdk_lib_list_to_files,$(SOCK_MODULES_LIST))
 
SOCK_MODULES_FILES = $(call spdk_lib_list_to_static_libs,$(SOCK_MODULES_LIST))