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 <[email protected]>

diff --git a/build/external/Makefile b/build/external/Makefile
index d35c655..b4a099c 100644 (file)
--- 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 d60a5a2..7512ad8 100644 (file)
--- 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)