Fix Carve compilation on FreeBSD

Based on the patch from Marcus von Appen, thanks!
Referenced by issue #37477, Unbreak the blender build on FreeBSD
2013-11-28 13:52:54 +06:00 · 2013-11-28 13:52:54 +06:00 · dc71cb5f6e · 2023-02-14 11:35:46 +01:00
parent a628ca9ebe
commit dc71cb5f6e
3 changed files with 25 additions and 0 deletions
--- a/extern/carve/lib/triangulator.cpp
+++ b/extern/carve/lib/triangulator.cpp
@ -27,6 +27,13 @@

 #include <algorithm>

+// Support for latest Clang/LLVM on FreeBSD which does have different libcxx.
+//
+// TODO(sergey): Move it some some more generic header with platform-specific
+//               declarations.
+#ifdef _LIBCPP_VERSION
+#  define __is_heap is_heap
+#endif

 namespace {
  // private code related to hole patching.
--- a/extern/carve/patches/clang_is_heap_fix.patch
+++ b/extern/carve/patches/clang_is_heap_fix.patch
@ -0,0 +1,17 @@
+diff -r 2e6e59022e6e lib/triangulator.cpp
+--- a/lib/triangulator.cpp	Fri Nov 09 09:35:35 2012 +1100
+++ b/lib/triangulator.cpp	Thu Nov 28 13:34:52 2013 +0600
+@@ -27,6 +27,13 @@
+ 
+ #include <algorithm>
+ 
+// Support for latest Clang/LLVM on FreeBSD which does have different libcxx.
+//
+// TODO(sergey): Move it some some more generic header with platform-specific
+//               declarations.
+#ifdef _LIBCPP_VERSION
+#  define __is_heap is_heap
+#endif
+ 
+ namespace {
+   // private code related to hole patching.
--- a/extern/carve/patches/series
+++ b/extern/carve/patches/series
@ -3,3 +3,4 @@ win32.patch
 mesh_iterator.patch
 mingw.patch
 gcc46.patch
+clang_is_heap_fix.patch