From d242783b0455525c2b07e728fb28b245814dcae6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>
Date: Mon, 23 Aug 2021 14:57:37 +0200
Subject: [PATCH] DPDK bump to v21.05 and c_args fix
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes: c849edfc256d ("DPDK build: fix l3fwd build and update Meson opts")
Change-Id: I4b50a8f3cdc5aa4bd20ce99d477fdaf1087fcac3
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
---
 DPDK_VPP_VER                              | 2 +-
 resources/libraries/bash/function/dpdk.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/DPDK_VPP_VER b/DPDK_VPP_VER
index 774381f470..0f4ed83856 100644
--- a/DPDK_VPP_VER
+++ b/DPDK_VPP_VER
@@ -1 +1 @@
-dpdk-21.02
+dpdk-21.05
diff --git a/resources/libraries/bash/function/dpdk.sh b/resources/libraries/bash/function/dpdk.sh
index ea7871bed7..491f03eec0 100644
--- a/resources/libraries/bash/function/dpdk.sh
+++ b/resources/libraries/bash/function/dpdk.sh
@@ -90,7 +90,8 @@ function dpdk_compile () {
     meson_options="-Dexamples=l3fwd "
 
     # i40e specific options
-    meson_options="${meson_options} -Dc_args=RTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
+    meson_options="${meson_options} \
+        -Dc_args=-DRTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
 
     # Configure generic build - the same used by VPP
     meson_options="${meson_options} -Dplatform=generic"
-- 
2.16.6