mem: fix 32-bit init config with meson

[dpdk.git] / config / meson.build

diff --git a/config/meson.build b/config/meson.build
index d3f05f8..241d62a 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -117,7 +117,7 @@ if not is_windows
 endif
 
 # use pthreads if available for the platform
-if not is_ms_linker
+if not is_windows
        add_project_link_arguments('-pthread', language: 'c')
        dpdk_extra_ldflags += '-pthread'
 endif
@@ -238,6 +238,11 @@ dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp'))
 dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
 dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
 dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
+if dpdk_conf.get('RTE_ARCH_64')
+       dpdk_conf.set('RTE_MAX_MEM_MB', 524288)
+else # for 32-bit we need smaller reserved memory areas
+       dpdk_conf.set('RTE_MAX_MEM_MB', 2048)
+endif
 
 
 compile_time_cpuflags = []
@@ -276,6 +281,7 @@ if is_windows
        endif
 
        add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
+       add_project_link_arguments('-ldbghelp', language: 'c')
 endif
 
 if get_option('b_lto')