Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

problem with blender and python 3.2

Browse Source 
- python 3.2 does 'import site' on startup which now tries to parse pyconfig.h which isn't copied. so for now just run without importing 'site', alternative would be to copy the header file for posix systems.
- cache PYTHON_VERSION variable so it can be set to 3.2, needed for copying python installation's other then 3.1.
This commit is contained in:
Campbell Barton
2011-02-08 06:22:06 +00:00
parent 9d6f9e74d4
commit 914e2ee01f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -226,7 +226,7 @@ if(UNIX AND NOT APPLE)
# No way to set py31. remove for now. # No way to set py31. remove for now.
# find_package(PythonLibs) # find_package(PythonLibs)
set(PYTHON /usr) set(PYTHON /usr)
set(PYTHON_VERSION 3.1) set(PYTHON_VERSION 3.1 CACHE STRING "")
set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "") set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
mark_as_advanced(PYTHON_INCLUDE_DIRS) mark_as_advanced(PYTHON_INCLUDE_DIRS)
# set(PYTHON_BINARY python) # not used yet # set(PYTHON_BINARY python) # not used yet

5
source/blender/python/intern/bpy_interface.c
View File

@@ -230,6 +230,11 @@ void BPY_python_start( int argc, char **argv )
BPY_python_start_path(); /* allow to use our own included python */ BPY_python_start_path(); /* allow to use our own included python */
/* Python 3.2 now looks for '2.56/python/include/python3.2d/pyconfig.h' to parse
* from the 'sysconfig' module which is used by 'site', so for now disable site.
* alternatively we could copy the file. */
Py_NoSiteFlag= 1;
Py_Initialize( ); Py_Initialize( );
// PySys_SetArgv( argc, argv); // broken in py3, not a huge deal // PySys_SetArgv( argc, argv); // broken in py3, not a huge deal