Commit 916f3d14 authored by Jim Harris's avatar Jim Harris
Browse files

env_dpdk: add functions to define dpdk_env make variables 



Create dpdk_lib_list_to_libs and dpdk_env_linker_args
functions to generate the library filename list and the
linker arguments respectively.  Use these functions
internally as well.

These will be useful as part of the Seastar work, where
Seastar pkg-config includes a bunch of the DPDK libraries,
and SPDK needs to just add a few more.

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

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469751


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 685cbeeb

lib/env_dpdk/env.mk

+10 −2
Original line number Diff line number Diff line
@@ -109,7 +109,15 @@ endif 
endif

endif



DPDK_LIB = $(DPDK_LIB_LIST:%=$(DPDK_ABS_DIR)/lib/lib%$(DPDK_LIB_EXT))

define dpdk_lib_list_to_libs

$(1:%=$(DPDK_ABS_DIR)/lib/lib%$(DPDK_LIB_EXT))

endef



define dpdk_env_linker_args

$(ENV_DPDK_FILE) -Wl,--whole-archive,--no-as-needed $(call dpdk_lib_list_to_libs,$1) -Wl,--no-whole-archive

endef



DPDK_LIB = $(call dpdk_lib_list_to_libs,$(DPDK_LIB_LIST))



# SPDK memory registration requires experimental (deprecated) rte_memory API for DPDK 18.05

ENV_CFLAGS = $(DPDK_INC) -Wno-deprecated-declarations
@@ -120,7 +128,7 @@ else 
ENV_DPDK_FILE = $(call spdk_lib_list_to_static_libs,env_dpdk)

endif

ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB)

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

ENV_LINKER_ARGS = $(call dpdk_env_linker_args,$(DPDK_LIB_LIST))



ifeq ($(CONFIG_IPSEC_MB),y)

ENV_LINKER_ARGS += -lIPSec_MB -L$(IPSEC_MB_DIR)