The library is called librte_pmd_octeonx_ssovf, so rename the map file
and set the name in the meson file so that the built library names with
meson and legacy makefiles are the same.
Also refactor how the event PMDs library names are built in Meson to
allow for this discrepancy in the octeonx driver (all other PMDs are
called FOO_event, while this is called octeonx_ssovf)
Fixes: bd77f2d64c44 ("event/octeontx: build with meson")
Cc: stable@dpdk.org
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
drivers/event/dpaa/meson.build | 1 +
drivers/event/dpaa2/meson.build | 1 +
drivers/event/meson.build | 2 +-
drivers/event/octeontx/Makefile | 2 +-
drivers/event/octeontx/meson.build | 1 +
...ntx_event_version.map => rte_pmd_octeontx_ssovf_version.map} | 0
drivers/event/opdl/meson.build | 1 +
drivers/event/skeleton/meson.build | 1 +
drivers/event/sw/meson.build | 1 +
9 files changed, 8 insertions(+), 2 deletions(-)
rename drivers/event/octeontx/{rte_pmd_octeontx_event_version.map => rte_pmd_octeontx_ssovf_version.map} (100%)
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2018 NXP
+name = 'dpaa_event'
if host_machine.system() != 'linux'
build = false
endif
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2018 NXP
+name = 'dpaa2_event'
if host_machine.system() != 'linux'
build = false
endif
@@ -4,4 +4,4 @@
drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw']
std_deps = ['eventdev', 'kvargs']
config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD'
-driver_name_fmt = 'rte_pmd_@0@_event'
+driver_name_fmt = 'rte_pmd_@0@'
@@ -19,7 +19,7 @@ LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx
LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs
LDLIBS += -lrte_bus_vdev
-EXPORT_MAP := rte_pmd_octeontx_event_version.map
+EXPORT_MAP := rte_pmd_octeontx_ssovf_version.map
LIBABIVER := 1
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
+name = 'octeontx_ssovf'
sources = files('ssovf_worker.c',
'ssovf_evdev.c',
'ssovf_evdev_selftest.c',
similarity index 100%
rename from drivers/event/octeontx/rte_pmd_octeontx_event_version.map
rename to drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
+name = 'opdl_event'
sources = files(
'opdl_evdev.c',
'opdl_evdev_init.c',
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+name = 'skeleton_event'
sources = files('skeleton_eventdev.c')
deps += ['bus_pci', 'bus_vdev']
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+name = 'sw_event'
allow_experimental_apis = true
sources = files('sw_evdev_scheduler.c',
'sw_evdev_selftest.c',