meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d9342a684b30fe839f710aadcb39c21dd3962206
Merge: 26a8b98 aad470d
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Mon Jan 27 02:41:33 2025 +0000
Merge branch 'bugfix/pthread' into 'main'
meson.build: explicitly check for pthread support
See merge request fontconfig/fontconfig!361
commit aad470dad519b6fe3459023b82941b4414b71313
Author: Thomas Devoogdt <thomas@xxxxxxxxxxxx>
Date: Sun Jan 26 10:15:39 2025 +0100
meson.build: explicitly check for pthread support
Tested using buildroot. The br-arm-full-nothread fails
because meson assumes thread support when cross-compiling.
Dependency threads found: YES unknown (cached)
Has header "pthread.h" : NO
Signed-off-by: Thomas Devoogdt <thomas@xxxxxxxxxxxx>
diff --git a/meson.build b/meson.build
index 85968b2..9e9993a 100644
--- a/meson.build
+++ b/meson.build
@@ -383,8 +383,10 @@ endif
if host_machine.system() != 'windows'
thread_dep = dependency('threads')
- conf.set('HAVE_PTHREAD', 1)
- deps += [thread_dep]
+ if thread_dep.found() and cc.has_header('pthread.h')
+ conf.set('HAVE_PTHREAD', 1)
+ deps += [thread_dep]
+ endif
endif
fc_templatedir = get_option('template-dir')
