From 589eb80a90e947469b0261420f8bba30e867ff0a Mon Sep 17 00:00:00 2001 From: James Westman Date: Tue, 10 Dec 2019 15:39:19 -0600 Subject: [PATCH] Fix build on musl-based systems On some systems, including Alpine Linux, musl is used instead of glibc. This commit patches the third-party V-HACD module to provide a macro not provided by musl. Fixes #31555. --- thirdparty/vhacd/0003-fix-musl-build.patch | 15 +++++++++++++++ thirdparty/vhacd/inc/vhacdMutex.h | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 thirdparty/vhacd/0003-fix-musl-build.patch diff --git a/thirdparty/vhacd/0003-fix-musl-build.patch b/thirdparty/vhacd/0003-fix-musl-build.patch new file mode 100644 index 0000000000..67af8546f3 --- /dev/null +++ b/thirdparty/vhacd/0003-fix-musl-build.patch @@ -0,0 +1,15 @@ +diff --git a/thirdparty/vhacd/inc/vhacdMutex.h b/thirdparty/vhacd/inc/vhacdMutex.h +index 6b09259200..d587dd6387 100644 +--- a/thirdparty/vhacd/inc/vhacdMutex.h ++++ b/thirdparty/vhacd/inc/vhacdMutex.h +@@ -71,7 +71,9 @@ + #include + #endif + +-#if defined(__APPLE__) ++// -- GODOT start -- ++#if defined(__APPLE__) || !defined(__GLIBC__) ++// -- GODOT end -- + #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE + #endif + diff --git a/thirdparty/vhacd/inc/vhacdMutex.h b/thirdparty/vhacd/inc/vhacdMutex.h index 6b09259200..d587dd6387 100644 --- a/thirdparty/vhacd/inc/vhacdMutex.h +++ b/thirdparty/vhacd/inc/vhacdMutex.h @@ -71,7 +71,9 @@ #include #endif -#if defined(__APPLE__) +// -- GODOT start -- +#if defined(__APPLE__) || !defined(__GLIBC__) +// -- GODOT end -- #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE #endif