meson guarantees this is portable, so this also allows us to remove a is_windows switch.
Link: https://mesonbuild.com/howtox.html#enable-threads Signed-off-by: Gabriel Ganne <gabriel.ga...@6wind.com> --- config/meson.build | 5 +---- lib/librte_metrics/meson.build | 2 ++ lib/librte_telemetry/meson.build | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/meson.build b/config/meson.build index 3cf560b8a3f5..0fb7e1b27a0f 100644 --- a/config/meson.build +++ b/config/meson.build @@ -113,10 +113,7 @@ if not is_windows endif # use pthreads if available for the platform -if not is_windows - add_project_link_arguments('-pthread', language: 'c') - dpdk_extra_ldflags += '-pthread' -endif +threads_dep = dependency('threads') # on some OS, maths functions are in a separate library if cc.find_library('m', required : false).found() diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build index d5be6a214530..29d922eded53 100644 --- a/lib/librte_metrics/meson.build +++ b/lib/librte_metrics/meson.build @@ -4,6 +4,8 @@ sources = files('rte_metrics.c', 'rte_metrics_telemetry.c') headers = files('rte_metrics.h', 'rte_metrics_telemetry.h') +ext_deps += threads_dep + jansson = dependency('jansson', required: false, method: 'pkg-config') if jansson.found() dpdk_conf.set('RTE_HAS_JANSSON', 1) diff --git a/lib/librte_telemetry/meson.build b/lib/librte_telemetry/meson.build index 719973ff9240..46ac9829e54b 100644 --- a/lib/librte_telemetry/meson.build +++ b/lib/librte_telemetry/meson.build @@ -3,6 +3,8 @@ includes = [global_inc] +ext_deps += threads_dep + sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c') headers = files('rte_telemetry.h') includes += include_directories('../librte_metrics') -- 2.29.2
