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

mk: add spdk_lib_list_to_shared_libs

Browse Source 
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: Jim Harris <james.r.harris@intel.com>
Change-Id: I6e5913addfbdd556fae2451d4e2b2c43feaf33ab

Reviewed-on: https://review.gerrithub.io/429286
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Lance Hartmann <lance.hartmann@oracle.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2018-10-12 14:50:36 -07:00
parent f0cb7b871e
commit 2c5b956ee5
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/env_dpdk/env.mk
View File

@ -94,7 +94,7 @@ endif
# SPDK memory registration requires experimental (deprecated) rte_memory API for DPDK 18.05 # SPDK memory registration requires experimental (deprecated) rte_memory API for DPDK 18.05
ENV_CFLAGS = $(DPDK_INC) -Wno-deprecated-declarations ENV_CFLAGS = $(DPDK_INC) -Wno-deprecated-declarations
ENV_CXXFLAGS = $(ENV_CFLAGS) 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_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB)
ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--whole-archive $(DPDK_LIB) -Wl,--no-whole-archive ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--whole-archive $(DPDK_LIB) -Wl,--no-whole-archive

2
mk/spdk.app.mk
View File

@ -55,7 +55,7 @@ SPDK_FILTER_LIB_LIST += $(filter spdk_mock,$(SPDK_LIB_LIST))
SPDK_WHOLE_ARCHIVE_LIB_LIST = $(SPDK_FILTER_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_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 = \ SPDK_LIB_LINKER_ARGS = \
-L$(SPDK_ROOT_DIR)/build/lib \ -L$(SPDK_ROOT_DIR)/build/lib \
-Wl,--whole-archive \ -Wl,--whole-archive \

6
mk/spdk.common.mk
View File

@ -291,6 +291,10 @@ INSTALL_HEADER=\
%.d: ; %.d: ;
define spdk_lib_list_to_files define spdk_lib_list_to_static_libs
$(1:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a) $(1:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a)
endef endef
define spdk_lib_list_to_shared_libs
$(1:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.so)
endef

2
mk/spdk.lib.mk
View File

@ -34,7 +34,7 @@
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map 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_LINKED_LIB := $(subst .a,.so,$(LIB))
SHARED_REALNAME_LIB := $(subst .so,.so.$(SO_SUFFIX_ALL),$(SHARED_LINKED_LIB)) SHARED_REALNAME_LIB := $(subst .so,.so.$(SO_SUFFIX_ALL),$(SHARED_LINKED_LIB))

8
mk/spdk.modules.mk
View File

@ -90,7 +90,7 @@ BLOCKDEV_MODULES_LINKER_ARGS = -Wl,--whole-archive \
-Wl,--no-whole-archive \ -Wl,--no-whole-archive \
$(BLOCKDEV_MODULES_DEPS) $(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_LIST = $(filter-out $(LVOL_MODULES_LIST),$(BLOCKDEV_MODULES_LIST))
BLOCKDEV_NO_LVOL_MODULES_LINKER_ARGS = -Wl,--whole-archive \ 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 \ -Wl,--no-whole-archive \
$(BLOCKDEV_MODULES_DEPS) $(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_LINKER_ARGS = -Wl,--whole-archive \
$(COPY_MODULES_LIST:%=-lspdk_%) \ $(COPY_MODULES_LIST:%=-lspdk_%) \
-Wl,--no-whole-archive \ -Wl,--no-whole-archive \
$(COPY_MODULES_DEPS) $(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_LINKER_ARGS = -Wl,--whole-archive \
$(SOCK_MODULES_LIST:%=-lspdk_%) \ $(SOCK_MODULES_LIST:%=-lspdk_%) \
$(SOCK_MODULES_DEPS) \ $(SOCK_MODULES_DEPS) \
-Wl,--no-whole-archive -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))