Since minimum meson version is now 0.57 we can remove all version checks for versions lower than that.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com> --- config/meson.build | 2 +- doc/api/meson.build | 2 +- drivers/meson.build | 3 --- lib/meson.build | 6 ------ 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config/meson.build b/config/meson.build index 8c8b019c25..913825b1ca 100644 --- a/config/meson.build +++ b/config/meson.build @@ -97,7 +97,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) if not is_windows meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', get_option('libdir'), pmd_subdir_opt) -elif meson.version().version_compare('>=0.55.0') +else # 0.55.0 is required to use external program with add_install_script meson.add_install_script(py3, files('../buildtools/symlink-drivers-solibs.py'), diff --git a/doc/api/meson.build b/doc/api/meson.build index 5b50692df9..404c145672 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -97,6 +97,6 @@ doc_target_names += 'Doxygen_API(Manpage)' # refresh the manpage database on install # if DPDK manpages are installed to a staging directory, not in MANPATH, this has no effect mandb = find_program('mandb', required: false) -if mandb.found() and get_option('enable_docs') and meson.version().version_compare('>=0.55.0') +if mandb.found() and get_option('enable_docs') meson.add_install_script(mandb) endif diff --git a/drivers/meson.build b/drivers/meson.build index 66931d4241..1cb98e9354 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -280,9 +280,6 @@ foreach subpath:subdirs lk_deps += [def_file] lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:drivers\\lib' + lib_name + '.dll.a'] - endif else mingw_map = custom_target(lib_name + '_mingw', command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], diff --git a/lib/meson.build b/lib/meson.build index 162287753f..ce92cb5537 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -276,14 +276,8 @@ foreach l:libraries if is_ms_compiler lk_args = ['/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['/implib:lib\\librte_' + l + '.dll.a'] - endif else lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a'] - endif endif else if is_windows -- 2.43.0