From 741a2fa043af6579aed8c0dd11083631ed978d94 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 6 Jun 2023 20:17:58 +0200 Subject: [PATCH] Build: patch Boost for incompatibility with Xcode and libc++ 15 This is fixed in newer boost versions, but stick to the existing version now for VFX platform compatibility. This change only affects macOS libraries, since no other platform uses libc++. --- .../build_environment/patches/boost.diff | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/build_files/build_environment/patches/boost.diff b/build_files/build_environment/patches/boost.diff index e2bc06dc747..b4158657677 100644 --- a/build_files/build_environment/patches/boost.diff +++ b/build_files/build_environment/patches/boost.diff @@ -5,8 +5,24 @@ #ifdef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H # undef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H -# define _DEBUG -+// BLENDER: TBB excepts this to have a value. ++// BLENDER: TBB expects this to have a value. +# define _DEBUG 1 # ifdef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H # undef _CRT_NOFORCE_MANIFEST_DEFINED_FROM_WRAP_PYTHON_H # undef _CRT_NOFORCE_MANIFEST +--- a/boost/config/stdlib/libcpp.hpp 2022-08-03 22:47:07.000000000 -0400 ++++ b/boost/config/stdlib/libcpp.hpp 2022-09-16 22:16:17.044119011 -0400 +@@ -168,4 +168,13 @@ + # define BOOST_NO_CXX14_HDR_SHARED_MUTEX + #endif + ++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 15000 ++// ++// Unary function is now deprecated in C++11 and later: ++// ++#if __cplusplus >= 201103L ++#define BOOST_NO_CXX98_FUNCTION_BASE ++#endif ++#endif ++ + // --- end ---