aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2024-09-30 21:00:13 -0400
committerMatthew Smith <mgsmith@netgate.com>2024-10-01 18:07:22 +0000
commit056b7d05875083fcb30637db848607c47cc9d3c9 (patch)
tree7b069b15523c8e8390ba887160fc586fe0cf585c /build
parentb2b87e481953a9b857ff0315194d43d538f31931 (diff)
build: fix dpdk mellanox driver build setting
- dpdk mellanox driver setting requires rdma-core.mk is included before dpdk.mk makefile. Include check for rdma-core_version variable definition in dpdk.mk to prevent a re-occurance of this issue. Type: fix Fixes: 70522a1dc Change-Id: I297cbd734ac7abe970eac7fb317d06b7acfc5a40 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'build')
-rw-r--r--build/external/Makefile2
-rw-r--r--build/external/packages/dpdk.mk3
2 files changed, 4 insertions, 1 deletions
diff --git a/build/external/Makefile b/build/external/Makefile
index d35c6553478..b4a099c57e1 100644
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -49,12 +49,12 @@ AARCH64=$(filter aarch64,$(shell uname -m))
include packages.mk
include packages/ipsec-mb.mk
include packages/quicly.mk
-include packages/dpdk.mk
ifneq ($(shell uname), FreeBSD)
include packages/rdma-core.mk
include packages/xdp-tools.mk
include packages/octeon-roc.mk
endif # ! FreeBSD
+include packages/dpdk.mk
.PHONY: clean
clean:
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index d60a5a28ef3..7512ad83846 100644
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -39,6 +39,9 @@ dpdk_depends := $(if $(ARCH_X86_64), ipsec-mb)
else
dpdk_depends := rdma-core $(if $(ARCH_X86_64), ipsec-mb)
endif
+ifeq ($(rdma-core_version),)
+$(error Missing rdma-core_version)
+endif
DPDK_MLX_DEFAULT := $(shell if grep -q "rdma=$(rdma-core_version) dpdk=$(dpdk_version)" mlx_rdma_dpdk_matrix.txt; then echo 'y'; else echo 'n'; fi)
DPDK_MLX4_PMD ?= $(DPDK_MLX_DEFAULT)
DPDK_MLX5_PMD ?= $(DPDK_MLX_DEFAULT)