From 05442cd78492259944d73fb52d7bca3b5ff9e0e6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 7 Aug 2021 17:28:47 +0200 Subject: [PATCH] package/bullet: fix musl build Fix the following build failure on musl raised since bump to version 3.0.9 in commit 28b4947ed8f53c4edfbf8fef9304dc76480c01ca: In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289, from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19, from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18, from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28: /tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()': /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'? 97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...HACD-inc-vhacdMutex.h-fix-musl-build.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch diff --git a/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch b/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch new file mode 100644 index 0000000000..d01bb97d99 --- /dev/null +++ b/package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch @@ -0,0 +1,42 @@ +From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 7 Aug 2021 17:11:24 +0200 +Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build + +Fix the following build failure on musl (which does not provide +PTHREAD_MUTEX_RECURSIVE_NP): + +In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289, + from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19, + from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18, + from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28: +/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()': +/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'? + 97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930] +--- + Extras/VHACD/inc/vhacdMutex.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h +index 4d1ad2a7d..78c111383 100644 +--- a/Extras/VHACD/inc/vhacdMutex.h ++++ b/Extras/VHACD/inc/vhacdMutex.h +@@ -69,7 +69,7 @@ + #include + #endif + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || !defined(__GLIBC__) + #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE + #endif + +-- +2.30.2 + -- 2.30.2