From c849edfc256df9c3de1ece6babcd4757bb2a8072 Mon Sep 17 00:00:00 2001 From: Juraj Linkeš Date: Mon, 23 Aug 2021 10:22:37 +0200 Subject: DPDK build: fix l3fwd build and update Meson opts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix l3fwd patch which broke because the code got moved. Rework two Meson options: * RTE_LIBRTE_I40E_16BYTE_RX_DESC using Meson option c_args instead of CFLAGS. According to Meson docs, using c_args is the proper way to pass C compiler arguments and the support for CFLAGS is there for legacy reasons and not guaranteed to work. * Add platform=generic which mirrors VPP configuration. This removes the need to hack Arm CPU and NUMA values as the generic build uses high enough values. Change-Id: Ibcb17879bdf26329881819c332c1782b9c713182 Signed-off-by: Juraj Linkeš --- resources/libraries/bash/entry/patch_l3fwd_flip_routes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources/libraries/bash/entry') diff --git a/resources/libraries/bash/entry/patch_l3fwd_flip_routes b/resources/libraries/bash/entry/patch_l3fwd_flip_routes index 3b35e1f930..23a6675145 100755 --- a/resources/libraries/bash/entry/patch_l3fwd_flip_routes +++ b/resources/libraries/bash/entry/patch_l3fwd_flip_routes @@ -1,7 +1,7 @@ #!/bin/sh -patch --ignore-whitespace --forward l3fwd_lpm.c <<"_EOF" -44,45c44,45 +patch --ignore-whitespace --forward main.c <<"_EOF" +185,186c185,186 < {RTE_IPV4(198, 18, 0, 0), 24, 0}, < {RTE_IPV4(198, 18, 1, 0), 24, 1}, --- -- cgit 1.2.3-korg