From 2c5b956ee5a7b0ce8274b72b944437733051c895 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 12 Oct 2018 14:50:36 -0700 Subject: [PATCH] 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: Jim Harris Change-Id: I6e5913addfbdd556fae2451d4e2b2c43feaf33ab Reviewed-on: https://review.gerrithub.io/429286 Reviewed-by: Ben Walker Reviewed-by: Lance Hartmann Reviewed-by: Changpeng Liu Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins --- lib/env_dpdk/env.mk | 2 +- mk/spdk.app.mk | 2 +- mk/spdk.common.mk | 6 +++++- mk/spdk.lib.mk | 2 +- mk/spdk.modules.mk | 8 ++++---- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index 97c87b459..989bdd11c 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -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 diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk index d55cf5b65..92a2ce100 100644 --- a/mk/spdk.app.mk +++ b/mk/spdk.app.mk @@ -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 \ diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index 0a1ab73c9..458da93e8 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -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 diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk index eb5369aab..354c3f47a 100644 --- a/mk/spdk.lib.mk +++ b/mk/spdk.lib.mk @@ -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)) diff --git a/mk/spdk.modules.mk b/mk/spdk.modules.mk index 88a404f48..77bcca0ad 100644 --- a/mk/spdk.modules.mk +++ b/mk/spdk.modules.mk @@ -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))