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: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port bonding")
Fixes: e1defba4cf66 ("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>

diff --git a/drivers/meson.build b/drivers/meson.build
index 3f8749d..29708cc 100644 (file)
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -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.

diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
index e3c8a67..bfec592 100644 (file)
--- a/drivers/net/ipn3ke/meson.build
+++ b/drivers/net/ipn3ke/meson.build
@@ -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

diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 206136f..d402706 100644 (file)
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -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')