X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fmeson.build;h=fdf76120ac55c7bb039f6fbee25e6a5541f180a0;hb=378cd4887d6c02bf771eee3a8b56a3af41f37b7c;hp=823e3ef839ed927f97cd3bfae0aa50db2c08301a;hpb=5ed3766981600785bcee40932feb0a4a186dfa7f;p=dpdk.git diff --git a/drivers/meson.build b/drivers/meson.build index 823e3ef839..fdf76120ac 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -1,38 +1,54 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -if is_windows - subdir_done() -endif - -# 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 and mempool. - 'crypto', # depends on common, bus and mempool (net in future). - 'compress', # depends on common, bus, mempool. - 'event', # depends on common, bus, mempool and net. - 'baseband', # depends on common and bus. - 'raw'] # depends on common, bus, mempool, net and event. - -disabled_drivers = get_option('disable_drivers').split(',') +# 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() default_cflags = machine_args +default_cflags += ['-DALLOW_EXPERIMENTAL_API'] +default_cflags += ['-DALLOW_INTERNAL_API'] + 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) @@ -41,9 +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 - version = 1 - allow_experimental_apis = false sources = [] + headers = [] objs = [] cflags = default_cflags includes = [include_directories(drv_path)] @@ -58,17 +73,14 @@ foreach class:dpdk_driver_classes ext_deps = [] pkgconfig_extra_libs = [] - # pull in driver directory which should assign to each of the above - subdir(drv_path) + if disabled_drivers.contains(drv_path) + build = false + reason = 'explicitly disabled via build config' + else + # pull in driver directory which should update all the local variables + subdir(drv_path) + endif - # skip disabled drivers. For meson 0.49 change this to use - # "in" keyword - foreach disable_path: disabled_drivers - if drv_path == disable_path - build = false - reason = 'Explicitly disabled via build config' - endif - endforeach if build # get dependency objs from strings shared_deps = ext_deps @@ -76,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 @@ -96,17 +108,14 @@ foreach class:dpdk_driver_classes '_disable_reason', reason) endif else - class_drivers += name - - dpdk_conf.set(config_flag_fmt.format(name.to_upper()),1) - lib_name = driver_name_fmt.format(name) - - if allow_experimental_apis - cflags += '-DALLOW_EXPERIMENTAL_API' - endif + 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 @@ -122,15 +131,7 @@ foreach class:dpdk_driver_classes command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen], output: out_filename, - depends: [pmdinfogen, tmp_lib]) - - if get_option('per_library_versions') - lib_version = '@0@.1'.format(version) - so_version = '@0@'.format(version) - else - lib_version = major_version - so_version = major_version - endif + depends: [tmp_lib]) # now build the static driver static_lib = static_library(lib_name, @@ -142,30 +143,42 @@ 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) - implib = dir_name + '.dll.a' + drv_path) + implib = 'lib' + lib_name + '.dll.a' def_file = custom_target(lib_name + '_def', - command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'], + command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], input: version_map, output: '@0@_exports.def'.format(lib_name)) - lk_deps = [version_map, def_file] + + mingw_map = custom_target(lib_name + '_mingw', + command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], + input: version_map, + output: '@0@_mingw.map'.format(lib_name)) + + lk_deps = [version_map, def_file, mingw_map] if is_windows - lk_args = ['-Wl,/def:' + def_file.full_path(), - '-Wl,/implib:lib\\' + implib] + if is_ms_linker + 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 else lk_args = ['-Wl,--version-script=' + version_map] # on unix systems check the output of the - # experimental syms script, using it as a + # check-symbols.sh script, using it as a # dependency of the .so build - lk_deps += custom_target(lib_name + '.exp_chk', - command: [check_experimental_syms, + lk_deps += custom_target(lib_name + '.sym_chk', + command: [check_symbols, version_map, '@INPUT@'], capture: true, input: static_lib, - output: lib_name + '.exp_chk') + output: lib_name + '.sym_chk') endif shared_lib = shared_library(lib_name, @@ -176,7 +189,7 @@ foreach class:dpdk_driver_classes c_args: cflags, link_args: lk_args, link_depends: lk_deps, - version: lib_version, + version: abi_version, soversion: so_version, install: true, install_dir: driver_install_path) @@ -186,7 +199,7 @@ foreach class:dpdk_driver_classes shared_dep = declare_dependency(link_with: shared_lib, include_directories: includes, dependencies: shared_deps) - static_dep = declare_dependency(link_with: static_lib, + static_dep = declare_dependency( include_directories: includes, dependencies: static_deps) @@ -200,5 +213,5 @@ foreach class:dpdk_driver_classes endif # build endforeach - set_variable(class + '_drivers', class_drivers) + set_variable(class + '_drivers', enabled_drivers) endforeach