From 98b29f6d1c3d14ec2a6fd83f72c3b96f7a7ce171 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 14 Mar 2019 20:07:06 +0100 Subject: [PATCH] meson.build: remove the libwinpthread-1.dll dependency on Windows Closes https://github.com/MusicPlayerDaemon/MPD/issues/507 --- NEWS | 2 ++ src/thread/meson.build | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 86f6d682e..af3e6e142 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ ver 0.21.6 (not yet released) * playlist - flac: fix use-after-free bug * support abstract sockets on Linux +* Windows + - remove the unused libwinpthread-1.dll dependency ver 0.21.5 (2019/02/22) * protocol diff --git a/src/thread/meson.build b/src/thread/meson.build index 241a3ed4e..408836481 100644 --- a/src/thread/meson.build +++ b/src/thread/meson.build @@ -1,4 +1,11 @@ -threads_dep = dependency('threads') +if is_windows + # avoid the unused libwinpthread-1.dll dependency on Windows; MPD + # doesn't use the pthread API on Windows, but this is what Meson + # unhelpfully detects for us + threads_dep = [] +else + threads_dep = dependency('threads') +endif conf.set('HAVE_PTHREAD_SETNAME_NP', compiler.has_function('pthread_setname_np', dependencies: threads_dep))