Commit 046bdc4a authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Tomasz Zawadzki
Browse files

dpdkbuild: build and link with rte_hash if RAID5 is built 



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: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1013


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 87e7eed1

dpdkbuild/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ ifeq ($(CONFIG_IGB_UIO_DRIVER),y) 
DPDK_OPTS += CONFIG_RTE_EAL_IGB_UIO=y

endif



ifeq ($(CONFIG_RAID5),y)

DPDK_OPTS += CONFIG_RTE_LIBRTE_HASH=y

endif



ifeq ($(DPDK_FRAMEWORK),y)

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT=y

DPDK_OPTS += CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y

lib/env_dpdk/env.mk

+12 −1
Original line number Diff line number Diff line
@@ -100,15 +100,26 @@ ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_kvargs.*)) 
DPDK_LIB_LIST += rte_kvargs

endif



LINK_HASH=n



ifeq ($(CONFIG_VHOST),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)

DPDK_LIB_LIST += rte_cryptodev

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

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

endef