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

dpdkbuild: build and link with rte_hash if RAID5 is built

Browse Source 
Compiling raid5 has a direct dependency on rte_hash,
which was only built if vhost was built.

The following didn't work:
./configure --with-raid5 --without-vhost

Change-Id: Id36a7d4a21c2e0db00b0641581542e244c4cbbb4
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1013
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Darek Stojaczyk 2020-02-26 11:36:41 +01:00 committed by Tomasz Zawadzki
parent 87e7eed129
commit 046bdc4abb
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dpdkbuild/Makefile
View File

@ -84,6 +84,10 @@ ifeq ($(CONFIG_IGB_UIO_DRIVER),y)
DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y
endif endif
ifeq ($(CONFIG_RAID5),y)
DPDK_OPTS += CONFIG_RTE_LIBRTE_HASH=y
endif
ifeq ($(DPDK_FRAMEWORK),y) ifeq ($(DPDK_FRAMEWORK),y)
DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y
DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y

13
lib/env_dpdk/env.mk
View File

@ -100,15 +100,26 @@ ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_kvargs.*))
DPDK_LIB_LIST += rte_kvargs DPDK_LIB_LIST += rte_kvargs
endif endif
LINK_HASH=n
ifeq ($(CONFIG_VHOST),y) ifeq ($(CONFIG_VHOST),y)
ifneq ($(CONFIG_VHOST_INTERNAL_LIB),y) ifneq ($(CONFIG_VHOST_INTERNAL_LIB),y)
DPDK_LIB_LIST += rte_vhost rte_net rte_hash DPDK_LIB_LIST += rte_vhost rte_net
LINK_HASH=y
ifneq ($(DPDK_FRAMEWORK),y) ifneq ($(DPDK_FRAMEWORK),y)
DPDK_LIB_LIST += rte_cryptodev DPDK_LIB_LIST += rte_cryptodev
endif endif
endif endif
endif endif
ifeq ($(CONFIG_RAID5),y)
LINK_HASH=y
endif
ifeq ($(LINK_HASH),y)
DPDK_LIB_LIST += rte_hash
endif
define dpdk_lib_list_to_libs define dpdk_lib_list_to_libs
$(1:%=$(DPDK_ABS_DIR)/lib/lib%$(DPDK_LIB_EXT)) $(1:%=$(DPDK_ABS_DIR)/lib/lib%$(DPDK_LIB_EXT))
endef endef