net/mlx5: fix WQE counter assert in free completion queue

[dpdk.git] / config / meson.build

diff --git a/config/meson.build b/config/meson.build
index 9fb903c..a29693b 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -57,9 +57,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 # driver .so files often depend upon the bus drivers for their connect bus,
 # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
 # to be in the library path, so symlink the drivers from the main lib directory.
-meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
-               get_option('libdir'),
-               pmd_subdir_opt)
+if not is_windows
+       meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+                       get_option('libdir'),
+                       pmd_subdir_opt)
+endif
 
 # set the machine type and cflags for it
 if meson.is_cross_build()
@@ -104,6 +106,7 @@ dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
 dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1)
 
 dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
+dpdk_conf.set('RTE_ARCH_32', cc.sizeof('void *') == 4)
 
 if not is_windows
        add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
@@ -252,7 +255,8 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 # set the install path for the drivers
 dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
 
-install_headers('rte_config.h', subdir: get_option('include_subdir_arch'))
+install_headers(['rte_config.h', 'rte_compatibility_defines.h'],
+               subdir: get_option('include_subdir_arch'))
 
 # enable VFIO only if it is linux OS
 dpdk_conf.set('RTE_EAL_VFIO', is_linux)
@@ -274,6 +278,8 @@ if is_windows
                add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
        endif
 
+       add_project_link_arguments('-lws2_32', language: 'c')
+
        # Contrary to docs, VirtualAlloc2() is exported by mincore.lib
        # in Windows SDK, while MinGW exports it by advapi32.a.
        if is_ms_linker