net/ipn3ke: fix meson build
The ipn3ke driver and the ifpga driver had circular dependencies on each other, meaning that neither could be built with meson. Fix this by: * setting the build order of net and raw to match that in makefiles * removing the dependency from the net driver on the rawdev one * fixing the dependency names in the rawdev driver meson.build file Fixes:8418c92811
("net/ipn3ke: remove configuration for i40e port bonding") Fixes:e1defba4cf
("raw/ifpga/base: support device tree") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Rosen Xu <rosen.xu@intel.com>
This commit is contained in:
parent
4c3834468b
commit
7a3c4f4de2
@ -9,8 +9,8 @@ endif
|
||||
dpdk_driver_classes = ['common',
|
||||
'bus',
|
||||
'mempool', # depends on common and bus.
|
||||
'raw', # depends on common and bus.
|
||||
'net', # depends on common, bus, mempool and raw.
|
||||
'net', # depends on common, bus, mempool
|
||||
'raw', # depends on common, bus and net.
|
||||
'crypto', # depends on common, bus and mempool (net in future).
|
||||
'compress', # depends on common, bus, mempool.
|
||||
'vdpa', # depends on common, bus and mempool.
|
||||
|
@ -21,9 +21,11 @@ endif
|
||||
if build
|
||||
allow_experimental_apis = true
|
||||
|
||||
includes += include_directories('../../raw/ifpga')
|
||||
|
||||
sources += files('ipn3ke_ethdev.c',
|
||||
'ipn3ke_representor.c',
|
||||
'ipn3ke_tm.c',
|
||||
'ipn3ke_flow.c')
|
||||
deps += ['bus_ifpga', 'sched', 'pmd_i40e', 'rawdev', 'rawdev_ifpga']
|
||||
deps += ['bus_ifpga', 'ethdev', 'sched']
|
||||
endif
|
||||
|
@ -15,7 +15,7 @@ if build
|
||||
objs = [base_objs]
|
||||
|
||||
deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
|
||||
'bus_vdev', 'bus_ifpga', 'net', 'i40e', 'ipn3ke']
|
||||
'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke']
|
||||
ext_deps += dep
|
||||
|
||||
sources = files('ifpga_rawdev.c')
|
||||
|
Loading…
Reference in New Issue
Block a user