net/hns3: fix flow director rule residue on malloc failure

[dpdk.git] / lib / meson.build

diff --git a/lib/meson.build b/lib/meson.build
index e5597f1..7712aa4 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -41,8 +41,11 @@ if is_windows
                'telemetry',
                'eal',
                'ring',
+               'rcu',
                'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci',
+               'cmdline',
                'hash',
+               'cfgfile',
        ] # only supported libraries for windows
 endif
 
@@ -63,6 +66,7 @@ foreach l:libraries
        use_function_versioning = false
        sources = []
        headers = []
+       indirect_headers = [] # public headers not directly included by apps
        includes = []
        cflags = default_cflags
        objs = [] # other object files to link against, used e.g. for
@@ -73,7 +77,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
 
@@ -98,8 +102,10 @@ 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_LIB_' + name.to_upper(), 1)
                install_headers(headers)
+               install_headers(indirect_headers)
+               dpdk_chkinc_headers += headers
 
                libname = 'rte_' + name
                includes += include_directories(dir_name)
@@ -139,8 +145,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',
@@ -154,8 +160,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()]