X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fmeson.build;h=fdf76120ac55c7bb039f6fbee25e6a5541f180a0;hb=cf38bcd7763fa4cf6347a93a6193e00205404275;hp=e76ebddfa02a7e962b8e6246c1b76862e87723dd;hpb=cf9b3c36e5a297200c169dbbf9d6e655d8096948;p=dpdk.git diff --git a/drivers/meson.build b/drivers/meson.build index e76ebddfa0..fdf76120ac 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -1,18 +1,22 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -# Defines the order in which the drivers are buit. -dpdk_driver_classes = ['common', - 'bus', - 'mempool', # depends on common and bus. - '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. - 'regex', # depends on common, bus, regexdev. - 'vdpa', # depends on common, bus and mempool. - 'event', # depends on common, bus, mempool and net. - 'baseband'] # depends on common and bus. +# Defines the order of dependencies evaluation +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. + 'crypto', # depends on common, bus and mempool (net in future). + 'compress', # depends on common, bus, mempool. + 'regex', # depends on common, bus, regexdev. + 'vdpa', # depends on common, bus and mempool. + 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. +] disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'), ).stdout().split() @@ -25,16 +29,26 @@ if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' endif -foreach class:dpdk_driver_classes +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 - subdir(class) - class_drivers = [] + # subpath can be either "class" or "class/driver" + if subpath.contains('/') + driver_path = subpath.split('/') + class = driver_path[0] + drivers += driver_path[1] + else + class = subpath + subdir(class) + endif + + # save class name on first occurrence + if not dpdk_driver_classes.contains(class) + dpdk_driver_classes += class + endif + # get already enabled drivers of the same class + enabled_drivers = get_variable(class + '_drivers', []) foreach drv:drivers drv_path = join_paths(class, drv) @@ -43,8 +57,8 @@ foreach class:dpdk_driver_classes build = true # set to false to disable, e.g. missing deps reason = '' # set if build == false to explain name = drv - fmt_name = '' sources = [] + headers = [] objs = [] cflags = default_cflags includes = [include_directories(drv_path)] @@ -61,7 +75,7 @@ foreach class:dpdk_driver_classes 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) @@ -74,7 +88,7 @@ foreach class:dpdk_driver_classes 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 @@ -94,34 +108,30 @@ foreach class:dpdk_driver_classes '_disable_reason', reason) endif else - class_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) + enabled_drivers += 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, @@ -133,9 +143,9 @@ foreach class:dpdk_driver_classes 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', @@ -151,8 +161,10 @@ foreach class:dpdk_driver_classes 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 @@ -201,5 +213,5 @@ foreach class:dpdk_driver_classes endif # build endforeach - set_variable(class + '_drivers', class_drivers) + set_variable(class + '_drivers', enabled_drivers) endforeach