diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-23 17:51:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-23 17:51:20 +0400 |
| commit | 03905043c63c42e2bd79e0d58f4ae1a7fc9d47f3 (patch) | |
| tree | 1515c674bc87d77305e7dd5aa2e8bc2d68cbcc43 /source | |
| parent | 8f486bdadc5824456c96d352d837ad0b7275f936 (diff) | |
minor changes to get numpy working with locally bundled python.
- enable site-packages for bundled python distrobution, py3.2 had a problem where it would try to parse headers we didnt include, but its resolved now.
- workaround for glitch I was having on arch-linux where lib64 would be be used for the bundled python directory when it was just a symlink.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 3 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 552df561bbd..f71ea02a510 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -259,12 +259,15 @@ void BPY_python_start(int argc, const char **argv) * Python doesn't expose a good way to set this. */ BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape"); + /* Update, Py3.3 resolves attempting to parse non-existing header */ +#if 0 /* Python 3.2 now looks for '2.xx/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. */ if (py_path_bundle) { Py_NoSiteFlag = 1; } +#endif Py_FrozenFlag = 1; diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 6455f9165ce..d5407fe38a2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -423,11 +423,15 @@ if(UNIX AND NOT APPLE) # on some platforms (like openSUSE) Python is linked # to be used from lib64 folder. # determine this from Python's libraries path - if(${PYTHON_LIBPATH} MATCHES "lib64$") + # + # ugh, its possible 'lib64' is just a symlink to 'lib' which causes incorrect use of 'lib64' + get_filename_component(_pypath_real ${PYTHON_LIBPATH} REALPATH) + if(${_pypath_real} MATCHES "lib64$") set(_target_LIB "lib64") else() set(_target_LIB "lib") endif() + unset(_pypath_real) # Copy the systems python into the install directory # Scons copy in tools/Blender.py |