usertools: fix pmdinfo parsing

[dpdk.git] / lib / meson.build

diff --git a/lib/meson.build b/lib/meson.build
index 094454e..ed00f89 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -41,6 +41,7 @@ if is_windows
                'telemetry',
                'eal',
                'ring',
+               'rcu',
                'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
                'cmdline',
                'hash',
@@ -74,7 +75,7 @@ foreach l:libraries
        ext_deps = []
        deps = []
        # eal is standard dependency once built
-       if dpdk_conf.has('RTE_LIBRTE_EAL')
+       if dpdk_conf.has('RTE_LIB_EAL')
                deps += ['eal']
        endif
 
@@ -156,8 +157,10 @@ foreach l:libraries
                                output: '@0@_mingw.map'.format(libname))
 
                        if is_ms_linker
-                               lk_args = ['-Wl,/def:' + def_file.full_path(),
-                                       '-Wl,/implib:lib\\' + implib]
+                               lk_args = ['-Wl,/def:' + def_file.full_path()]
+                               if meson.version().version_compare('<0.54.0')
+                                       lk_args += ['-Wl,/implib:lib\\' + implib]
+                               endif
                        else
                                if is_windows
                                        lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]