From 514fb34ca4034d9687665d0d33c4fe5227a1ca75 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 24 Sep 2020 14:48:02 +0000 Subject: [PATCH] env_dpdk: remove special rte_pci and rte_bus_pci handling These libraries have existed since DPDK 17.11. We do not support any DPDK versions older than that, so there is no need to conditionally handle cases where those libraries do not exist. Signed-off-by: Jim Harris Change-Id: I3906db4d07ae04344b4c3bfaac02da58f248bf75 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4392 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker --- lib/env_dpdk/env.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index 049887b13..027000006 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -54,7 +54,7 @@ else DPDK_LIB_EXT = .a endif -DPDK_LIB_LIST = rte_eal rte_mempool rte_ring rte_mbuf +DPDK_LIB_LIST = rte_eal rte_mempool rte_ring rte_mbuf rte_pci rte_bus_pci # librte_mempool_ring was new added from DPDK 17.05. Link this library used for # ring based mempool management API. @@ -62,16 +62,6 @@ ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_mempool_ring.*)) DPDK_LIB_LIST += rte_mempool_ring endif -# librte_pci and librte_bus_pci were added in DPDK 17.11. Link these libraries conditionally -# based on their existence to maintain backward compatibility. -ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_pci.*)) -DPDK_LIB_LIST += rte_pci -endif - -ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_bus_pci.*)) -DPDK_LIB_LIST += rte_bus_pci -endif - # DPDK 20.05 eal dependency ifneq (, $(wildcard $(DPDK_ABS_DIR)/lib/librte_telemetry.*)) DPDK_LIB_LIST += rte_telemetry