From de2609a241d9a9463b84768f7e902868f3de6f7a Mon Sep 17 00:00:00 2001 From: Jacek Kalwas Date: Thu, 6 Apr 2023 11:00:53 -0400 Subject: [PATCH] env_dpdk: put rte_rcu on DPDK_LIB_LIST unconditionally rte_rcu is available on all versions of DPDK supported by SPDK. It is also required by quite a few DPDK libraries. So just include it always, it's a small library so let's not try to over-complicate by trying to figure out exactly when it's needed. This change fixes linking issue when crypto enabled (and vhost not). Signed-off-by: Jacek Kalwas Change-Id: Ibdd6acb5a25c401b462022bbd94bd380690640d0 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17514 Reviewed-by: Shuhei Matsumoto Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk --- lib/env_dpdk/env.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index e423c970d..08f313271 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -33,7 +33,7 @@ endif DPDK_INC := -I$(DPDK_INC_DIR) DPDK_LIB_LIST = rte_eal rte_mempool rte_ring rte_mbuf rte_bus_pci rte_pci rte_mempool_ring -DPDK_LIB_LIST += rte_telemetry rte_kvargs +DPDK_LIB_LIST += rte_telemetry rte_kvargs rte_rcu DPDK_POWER=n @@ -116,9 +116,6 @@ endif ifeq ($(LINK_HASH),y) DPDK_LIB_LIST += rte_hash -ifneq (, $(wildcard $(DPDK_LIB_DIR)/librte_rcu.*)) -DPDK_LIB_LIST += rte_rcu -endif endif