1*4882a593SmuzhiyunFrom 96bbf3a3af45d86f790afdf91a6686c37421e92b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 15 Nov 2020 10:57:37 +0100 4*4882a593SmuzhiyunSubject: [PATCH] meson.build: check for pthread.h 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunCheck for pthread.h otherwise the build will fail with some toolchains 7*4882a593Smuzhiyunthat have libphtread.so but not pthread.h: 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunRun-time dependency threads found: YES 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun../src/hb-mutex.hh:53:10: fatal error: pthread.h: No such file or directory 12*4882a593Smuzhiyun #include <pthread.h> 13*4882a593Smuzhiyun ^~~~~~~~~~~ 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunMoreover, fix detection of pthread fallback 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunFixes: 18*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/70c98e89b1d5e5b651d1f6928dc53f465103f57a 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 21*4882a593Smuzhiyun--- 22*4882a593Smuzhiyun meson.build | 6 ++++-- 23*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 2 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/meson.build b/meson.build 26*4882a593Smuzhiyunindex bf3925db..6d263d48 100644 27*4882a593Smuzhiyun--- a/meson.build 28*4882a593Smuzhiyun+++ b/meson.build 29*4882a593Smuzhiyun@@ -270,7 +270,9 @@ endif 30*4882a593Smuzhiyun # threads 31*4882a593Smuzhiyun thread_dep = null_dep 32*4882a593Smuzhiyun if host_machine.system() != 'windows' 33*4882a593Smuzhiyun- thread_dep = dependency('threads', required: false) 34*4882a593Smuzhiyun+ if cpp.has_header('pthread.h') 35*4882a593Smuzhiyun+ thread_dep = dependency('threads', required: false) 36*4882a593Smuzhiyun+ endif 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun if thread_dep.found() 39*4882a593Smuzhiyun conf.set('HAVE_PTHREAD', 1) 40*4882a593Smuzhiyun-- 41*4882a593Smuzhiyun2.29.2 42*4882a593Smuzhiyun 43