Commit 514fb34c authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I3906db4d07ae04344b4c3bfaac02da58f248bf75
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4392


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8998ac11

lib/env_dpdk/env.mk

+1 −11
Original line number Diff line number Diff line
@@ -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