usertools: fix pmdinfo parsing

[dpdk.git] / lib / meson.build

diff --git a/lib/meson.build b/lib/meson.build
index 8ca2517..ed00f89 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -24,7 +24,7 @@ libraries = [
        'distributor', 'efd', 'eventdev',
        'gro', 'gso', 'ip_frag', 'jobstats',
        'kni', 'latencystats', 'lpm', 'member',
-       'power', 'pdump', 'rawdev',
+       'power', 'pdump', 'rawdev', 'regexdev',
        'rib', 'reorder', 'sched', 'security', 'stack', 'vhost',
        # ipsec lib depends on net, crypto and security
        'ipsec',
@@ -38,9 +38,13 @@ libraries = [
 if is_windows
        libraries = [
                'kvargs',
+               'telemetry',
                'eal',
                'ring',
-               'pci',
+               'rcu',
+               'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
+               'cmdline',
+               'hash',
        ] # only supported libraries for windows
 endif
 
@@ -71,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
 
@@ -96,7 +100,8 @@ foreach l:libraries
                set_variable(name.underscorify() + '_disable_reason', reason)
        else
                enabled_libs += name
-               dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1)
+               dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro
+               dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro
                install_headers(headers)
 
                libname = 'rte_' + name
@@ -107,25 +112,15 @@ foreach l:libraries
                        shared_dep = declare_dependency(include_directories: includes)
                        static_dep = shared_dep
                else
+                       if is_windows and use_function_versioning
+                               message('@0@: Function versioning is not supported by Windows.'
+                               .format(name))
+                       endif
 
                        if use_function_versioning
                                cflags += '-DRTE_USE_FUNCTION_VERSIONING'
                        endif
 
-                       version_map = '@0@/@1@/rte_@2@_version.map'.format(
-                                       meson.current_source_dir(), dir_name, name)
-
-                       is_stable = run_command(is_stable_cmd,
-                                       files(version_map)).returncode() == 0
-
-                       if is_stable
-                               lib_version = abi_version
-                               so_version = stable_so_version
-                       else
-                               lib_version = experimental_abi_version
-                               so_version = experimental_so_version
-                       endif
-
                        # first build static lib
                        static_lib = static_library(libname,
                                        sources,
@@ -138,7 +133,7 @@ foreach l:libraries
                                        include_directories: includes,
                                        dependencies: static_deps)
 
-                       if not use_function_versioning
+                       if not use_function_versioning or is_windows
                                # use pre-build objects to build shared lib
                                sources = []
                                objs += static_lib.extract_all_objects(recursive: false)
@@ -147,8 +142,8 @@ foreach l:libraries
                                # RTE_BUILD_SHARED_LIB defined
                                cflags += '-DRTE_BUILD_SHARED_LIB'
                        endif
-                       version_map = '@0@/@1@/rte_@2@_version.map'.format(
-                                       meson.current_source_dir(), dir_name, name)
+                       version_map = '@0@/@1@/version.map'.format(
+                                       meson.current_source_dir(), dir_name)
                        implib = dir_name + '.dll.a'
 
                        def_file = custom_target(libname + '_def',
@@ -162,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()]
@@ -193,7 +190,7 @@ foreach l:libraries
                                        include_directories: includes,
                                        link_args: lk_args,
                                        link_depends: lk_deps,
-                                       version: lib_version,
+                                       version: abi_version,
                                        soversion: so_version,
                                        install: true)
                        shared_dep = declare_dependency(link_with: shared_lib,