pixman: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Nov 8 18:50:17 UTC 2023


 meson.build |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4b789df5b39cecdb598b35a3aa2ca9637029564
Author: Benjamin Gilbert <bgilbert at backtick.net>
Date:   Sat Sep 23 00:57:14 2023 -0500

    meson: avoid linking with -pthread if we don't have pthreads
    
    Meson always returns -pthread in dependency('threads') on non-MSVC
    compilers.  Fix a link error when building on MinGW without winpthreads.

diff --git a/meson.build b/meson.build
index f822fb5..5c896ac 100644
--- a/meson.build
+++ b/meson.build
@@ -485,6 +485,9 @@ if dep_threads.found() and cc.has_header('pthread.h')
   else
     pthreads_found = true
   endif
+else
+  # Avoid linking with -pthread if we don't actually have pthreads
+  dep_threads = null_dep
 endif
 
 if pthreads_found


More information about the xorg-commit mailing list