From: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Date: Fri, 19 Jan 2018 18:15:20 +0000 (+0530)
Subject: event/octeontx: build with meson
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=bd77f2d64c44;p=dpdk.git

event/octeontx: build with meson

Add Cavium octeontx to meson build and change order of drivers built
from event->mempool->net to mempool->net->event to resolve dependency.

Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---

diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index 437d80bfd4..d7bc48545a 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['skeleton', 'sw']
+drivers = ['skeleton', 'sw', 'octeontx']
 std_deps = ['eventdev', 'kvargs']
 config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD'
 driver_name_fmt = 'rte_pmd_@0@_event'
diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile
index 4b5fd25d48..0e49efd84e 100644
--- a/drivers/event/octeontx/Makefile
+++ b/drivers/event/octeontx/Makefile
@@ -17,7 +17,7 @@ LDLIBS += -lrte_eal -lrte_eventdev -lrte_mempool_octeontx -lrte_pmd_octeontx
 LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs
 LDLIBS += -lrte_bus_vdev
 
-EXPORT_MAP := rte_pmd_octeontx_ssovf_version.map
+EXPORT_MAP := rte_pmd_octeontx_event_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build
new file mode 100644
index 0000000000..358fc9fc90
--- /dev/null
+++ b/drivers/event/octeontx/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Cavium, Inc
+
+sources = files('ssovf_worker.c',
+		'ssovf_evdev.c',
+		'ssovf_evdev_selftest.c'
+)
+
+deps += ['mempool_octeontx', 'bus_vdev', 'pmd_octeontx']
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
new file mode 100644
index 0000000000..5352e7e3bd
--- /dev/null
+++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
@@ -0,0 +1,3 @@
+DPDK_17.05 {
+	local: *;
+};
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map b/drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map
deleted file mode 100644
index 5352e7e3bd..0000000000
--- a/drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map
+++ /dev/null
@@ -1,3 +0,0 @@
-DPDK_17.05 {
-	local: *;
-};
diff --git a/drivers/meson.build b/drivers/meson.build
index 5ee00264e6..a771b12e47 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -1,7 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-driver_classes = ['bus', 'crypto', 'event', 'mempool', 'net']
+# Defines the order in which the drivers are buit.
+driver_classes = ['bus',
+	       'mempool', # depends on bus.
+	       'net',     # depends on bus and mempool.
+	       'crypto',  # depenss on bus, mempool (net in future).
+	       'event']   # depends on bus, mempool and net.
 
 foreach class:driver_classes
 	drivers = []