diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-27 14:24:18 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-27 14:24:18 +0400 |
| commit | 9b14d3608f7790a23505bd2b892963efe61b80fe (patch) | |
| tree | 0fdcf4da47302eae6d4cf4f1b26136288dfb3d43 /source/creator/blender.map | |
| parent | a7555a81c7a120477fe1b771e336cf8e38bb415d (diff) | |
Mark boost symbols as local
This was needed to resolve conflict between blender's and pylux's boost symbols.
Ideally visibility should be changed to local in lux as well, since if blender is
dynamically linked against boost it'll still crash.
Anyway, having this change wouldn't hurt and will solve issues with lux for official
linux builds at least.
Diffstat (limited to 'source/creator/blender.map')
| -rw-r--r-- | source/creator/blender.map | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/creator/blender.map b/source/creator/blender.map index dc7bc3151e8..928d0c2d904 100644 --- a/source/creator/blender.map +++ b/source/creator/blender.map @@ -1,11 +1,16 @@ -/* on Linux we exclude LLVM symbols, they conflict with Mesa llvmpipe */ +/* on Linux we exclude LLVM symbols, they conflict with Mesa llvmpipe + * we also keep boost's symbols local, since some python modules could + * be using boost as well (mainly that's for lux render) + */ { global: *; + *_boost*; local: *llvm*; *LLVM*; + *boost*; }; |