From 9b14d3608f7790a23505bd2b892963efe61b80fe Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 27 Nov 2012 10:24:18 +0000 Subject: 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. --- source/creator/blender.map | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/creator/blender.map') 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*; }; -- cgit v1.2.3