Commit: 019b930d6b9ca87938032bef1eacadf70668c1aa Author: Brecht Van Lommel Date: Fri Dec 9 17:08:35 2022 +0100 Branches: master https://developer.blender.org/rB019b930d6b9ca87938032bef1eacadf70668c1aa
Fix build error with new USD libraries in debug mode Solve conflict between TBB and Boost Python. =================================================================== M build_files/build_environment/cmake/boost.cmake A build_files/build_environment/patches/boost.diff =================================================================== diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 495b419e69c..0daf38f0bf9 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -23,13 +23,11 @@ elseif(APPLE) set(BOOST_BUILD_COMMAND ./b2) set(BOOST_BUILD_OPTIONS toolset=clang-darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off) set(BOOST_HARVEST_CMD echo .) - set(BOOST_PATCH_COMMAND echo .) else() set(BOOST_HARVEST_CMD echo .) set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh) set(BOOST_BUILD_COMMAND ./b2) set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off) - set(BOOST_PATCH_COMMAND echo .) endif() set(JAM_FILE ${BUILD_DIR}/boost.user-config.jam) @@ -72,7 +70,7 @@ ExternalProject_Add(external_boost URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH} PREFIX ${BUILD_DIR}/boost UPDATE_COMMAND "" - PATCH_COMMAND ${BOOST_PATCH_COMMAND} + PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND} BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=shared threading=multi ${BOOST_OPTIONS} --prefix=${LIBDIR}/boost install BUILD_IN_SOURCE 1 diff --git a/build_files/build_environment/patches/boost.diff b/build_files/build_environment/patches/boost.diff new file mode 100644 index 00000000000..e2bc06dc747 --- /dev/null +++ b/build_files/build_environment/patches/boost.diff @@ -0,0 +1,12 @@ +--- a/boost/python//detail/wrap_python.hpp 2022-12-09 19:16:17 ++++ b/boost/python//detail/wrap_python.hpp 2022-12-09 19:18:08 +@@ -206,7 +206,8 @@ + + #ifdef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H + # undef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H +-# define _DEBUG ++// BLENDER: TBB excepts 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 _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs