With the addition of automatic dependency tracking so that dependencies are automatically enabled for libraries and drivers, the error message for a missing library is now inaccurate (although following it will lead eventually to a solution by way of other error messages!).
Improve this situation by correctly reporting if a necessary component is explicitly disabled or cannot be built for some other reason. Signed-off-by: Bruce Richardson <[email protected]> drivers --- drivers/meson.build | 27 ++++++++++++++++++++++++++- lib/meson.build | 16 ++++++++++++---- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index fe514a0b15..aacfe29c46 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -248,8 +248,33 @@ foreach subpath:subdirs # error out if we can't build a driver and that driver was explicitly # requested, i.e. not via wildcard. if require_drivers and get_option('enable_drivers').contains(drv_path) + # reconstruct the path from the name by replacing the first + # "_" with a "/"; the class never contains an underscore + d_parts = d.split('_') + d_rest = [] + foreach i : range(1, d_parts.length()) + d_rest += d_parts[i] + endforeach + missing_path = d_parts[0] + '/' + '_'.join(d_rest) + if driver_map.has_key(missing_path) + # disable_drivers/dpdk_drvs_disabled store the canonical + # path, e.g. net/intel/idpf rather than the legacy net/idpf + missing_path = driver_map[missing_path] + endif + if disable_drivers.contains(missing_path) + advice = 'Remove "@0@" from the "disable_drivers" option.'.format( + missing_path) + elif dpdk_drvs_disabled.contains(missing_path) + advice = 'Driver "@0@" cannot be built: @1@'.format(missing_path, + get_variable('drv_' + missing_path.underscorify() + + '_disable_reason')) + else + advice = 'Please check the build configuration for driver "@0@".'.format( + missing_path) + endif error('Cannot build explicitly requested driver "@0@".\n'.format(drv_path) - +'\tPlease enable missing dependency "@0@"'.format(d)) + + '\tMissing dependency "@0@".\n'.format(d) + + '\t' + advice) endif else shared_deps += [get_variable('shared_rte_' + d)] diff --git a/lib/meson.build b/lib/meson.build index f7705d7ebe..8adb510513 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -106,7 +106,6 @@ foreach l:requested_libs error('Library "@0@" is in both "enable_libs" and "disable_libs".'.format(l)) endif endforeach -require_libs = requested_libs.length() != 0 # expand the requested libraries to also include the libraries they depend on, # with an empty request meaning every library is wanted @@ -173,7 +172,7 @@ foreach l:libraries if build subdir(l) - if not build and require_libs + if not build and requested_libs.contains(l) error('Cannot build explicitly requested lib "@0@".\n'.format(name) +'\tReason: ' + reason) endif @@ -196,9 +195,18 @@ foreach l:libraries endif message('Disabling @1@ [@2@]: missing internal dependency "@0@"' .format(d, name, 'lib/' + l)) - if require_libs + if requested_libs.contains(l) + if disable_libs.contains(d) + advice = 'Remove "@0@" from the "disable_libs" option.'.format(d) + elif dpdk_libs_disabled.contains(d) + advice = 'Library "@0@" cannot be built: @1@'.format(d, + get_variable('lib_' + d.underscorify() + '_disable_reason')) + else + advice = 'Please check the build configuration for library "@0@".'.format(d) + endif error('Cannot build explicitly requested lib "@0@".\n'.format(name) - + '\tPlease add missing dependency "@0@" to "enable_libs" option'.format(d)) + + '\tMissing dependency "@0@".\n'.format(d) + + '\t' + advice) endif else shared_deps += [get_variable('shared_rte_' + d)] -- 2.53.0
