Commit e5bf4f06 authored Feb 09, 2020 by Evgeniy Kochetov Committed by Tomasz Zawadzki Feb 11, 2020

make: Fix shared lib build



Build with shared libraries fails if there is '.a' anywhere in the
path to spdk, e.g. '/home/user/dir.auto/spdk'.
'subst' function in spdk.lib.mk is replaced with substitution
reference, that alters only suffixes.

Signed-off-by: Evgeniy Kochetov <evgeniik@mellanox.com>
Change-Id: I5dd06ab95b85d5dd93becff001cef8e78daa0b81
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/669


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>

parent e97ad60f

mk/spdk.lib.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk

		SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map
		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))
		SHARED_LINKED_LIB := $(LIB:.a=.so)
		SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB:.so=.so.$(SO_SUFFIX_ALL))

		ifeq ($(CONFIG_SHARED),y)
		DEP := $(SHARED_LINKED_LIB)

Admin message