1From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sat, 7 Aug 2021 17:11:24 +0200
4Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build
5
6Fix the following build failure on musl (which does not provide
7PTHREAD_MUTEX_RECURSIVE_NP):
8
9In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289,
10                 from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19,
11                 from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18,
12                 from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28:
13/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()':
14/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'?
15   97 |   VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0);
16      |                                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
17
18Fixes:
19 - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e
20
21Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
22[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930]
23---
24 Extras/VHACD/inc/vhacdMutex.h | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h
28index 4d1ad2a7d..78c111383 100644
29--- a/Extras/VHACD/inc/vhacdMutex.h
30+++ b/Extras/VHACD/inc/vhacdMutex.h
31@@ -69,7 +69,7 @@
32 #include <pthread.h>
33 #endif
34
35-#if defined(__APPLE__)
36+#if defined(__APPLE__) || !defined(__GLIBC__)
37 #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
38 #endif
39
40--
412.30.2
42
43