[Bf-blender-cvs] [0ddf5860f56] blender-v2.83-release: Fix Python bz2 module failing to import on older macOS versions
Brecht Van Lommel
noreply at git.blender.org
Wed Apr 29 16:26:08 CEST 2020
Commit: 0ddf5860f56e66f62bc3a27d98fedc0edaba371a
Author: Brecht Van Lommel
Date: Wed Apr 29 16:23:52 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB0ddf5860f56e66f62bc3a27d98fedc0edaba371a
Fix Python bz2 module failing to import on older macOS versions
Found by failing bundled modules test. The bz2 library was compiled without
proper minimum SDK version flags.
===================================================================
M build_files/build_environment/cmake/bzip2.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/bzip2.cmake b/build_files/build_environment/cmake/bzip2.cmake
index fbf5551e719..bb2be7c634a 100644
--- a/build_files/build_environment/cmake/bzip2.cmake
+++ b/build_files/build_environment/cmake/bzip2.cmake
@@ -25,6 +25,8 @@ if(UNIX AND NOT APPLE)
set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
&& export PREFIX=${BZIP2_PREFIX})
+else()
+ set(BZIP2_CONFIGURE_ENV ${CONFIGURE_ENV})
endif()
ExternalProject_Add(external_bzip2
More information about the Bf-blender-cvs
mailing list