net/octeontx2: fix VLAN filter

[dpdk.git] / drivers / meson.build

diff --git a/drivers/meson.build b/drivers/meson.build
index 0389574..fdf7612 100644 (file)
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -5,6 +5,8 @@
 subdirs = [
        'common',
        'bus',
+       'common/mlx5', # depends on bus.
+       'common/qat', # depends on bus.
        'mempool', # depends on common and bus.
        'net',     # depends on common, bus, mempool
        'raw',     # depends on common, bus and net.
@@ -30,10 +32,6 @@ endif
 foreach subpath:subdirs
        drivers = []
        std_deps = []
-       config_flag_fmt = '' # format string used to set the value in dpdk_conf
-       driver_name_fmt = '' # format string for driver name, used to name
-                            # the library, the dependency and to find the
-                            # version file for linking
 
        # subpath can be either "class" or "class/driver"
        if subpath.contains('/')
@@ -59,8 +57,8 @@ foreach subpath:subdirs
                build = true # set to false to disable, e.g. missing deps
                reason = '<unknown reason>' # set if build == false to explain
                name = drv
-               fmt_name = ''
                sources = []
+               headers = []
                objs = []
                cflags = default_cflags
                includes = [include_directories(drv_path)]
@@ -77,7 +75,7 @@ foreach subpath:subdirs
 
                if disabled_drivers.contains(drv_path)
                        build = false
-                       reason = 'Explicitly disabled via build config'
+                       reason = 'explicitly disabled via build config'
                else
                        # pull in driver directory which should update all the local variables
                        subdir(drv_path)
@@ -90,7 +88,7 @@ foreach subpath:subdirs
                        foreach d:deps
                                if not is_variable('shared_rte_' + d)
                                        build = false
-                                       reason = 'Missing internal dependency, "@0@"'.format(d)
+                                       reason = 'missing internal dependency, "@0@"'.format(d)
                                        message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
                                                        .format(d, name, 'drivers/' + drv_path))
                                else
@@ -111,33 +109,29 @@ foreach subpath:subdirs
                        endif
                else
                        enabled_drivers += name
-
-                       if fmt_name == ''
-                               fmt_name = name
-                       endif
-                       dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1)
-                       lib_name = driver_name_fmt.format(fmt_name)
+                       lib_name = '_'.join(['rte', class, name])
+                       dpdk_conf.set(lib_name.to_upper(), 1)
 
                        dpdk_extra_ldflags += pkgconfig_extra_libs
 
+                       install_headers(headers)
+
                        # generate pmdinfo sources by building a temporary
                        # lib and then running pmdinfogen on the contents of
                        # that lib. The final lib reuses the object files and
                        # adds in the new source file.
-                       if not is_windows
-                               out_filename = lib_name + '.pmd.c'
-                               tmp_lib = static_library('tmp_' + lib_name,
-                                               sources,
-                                               include_directories: includes,
-                                               dependencies: static_deps,
-                                               c_args: cflags)
-                               objs += tmp_lib.extract_all_objects()
-                               sources = custom_target(out_filename,
-                                               command: [pmdinfo, tmp_lib.full_path(),
-                                                       '@OUTPUT@', pmdinfogen],
-                                               output: out_filename,
-                                               depends: [pmdinfogen, tmp_lib])
-                       endif
+                       out_filename = lib_name + '.pmd.c'
+                       tmp_lib = static_library('tmp_' + lib_name,
+                                       sources,
+                                       include_directories: includes,
+                                       dependencies: static_deps,
+                                       c_args: cflags)
+                       objs += tmp_lib.extract_all_objects()
+                       sources = custom_target(out_filename,
+                                       command: [pmdinfo, tmp_lib.full_path(),
+                                               '@OUTPUT@', pmdinfogen],
+                                       output: out_filename,
+                                       depends: [tmp_lib])
 
                        # now build the static driver
                        static_lib = static_library(lib_name,
@@ -149,9 +143,9 @@ foreach subpath:subdirs
                                install: true)
 
                        # now build the shared driver
-                       version_map = '@0@/@1@/@2@_version.map'.format(
+                       version_map = '@0@/@1@/version.map'.format(
                                        meson.current_source_dir(),
-                                       drv_path, lib_name)
+                                       drv_path)
                        implib = 'lib' + lib_name + '.dll.a'
 
                        def_file = custom_target(lib_name + '_def',
@@ -167,8 +161,10 @@ foreach subpath:subdirs
                        lk_deps = [version_map, def_file, mingw_map]
                        if is_windows
                                if is_ms_linker
-                                       lk_args = ['-Wl,/def:' + def_file.full_path(),
-                                               '-Wl,/implib:drivers\\' + implib]
+                                       lk_args = ['-Wl,/def:' + def_file.full_path()]
+                                       if meson.version().version_compare('<0.54.0')
+                                               lk_args += ['-Wl,/implib:drivers\\' + implib]
+                                       endif
                                else
                                        lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
                                endif