[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52601] trunk/blender/source/creator/ blender.map: Mark boost symbols as local
Sergey Sharybin
sergey.vfx at gmail.com
Tue Nov 27 11:24:20 CET 2012
Revision: 52601
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52601
Author: nazgul
Date: 2012-11-27 10:24:18 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/creator/blender.map
Modified: trunk/blender/source/creator/blender.map
===================================================================
--- trunk/blender/source/creator/blender.map 2012-11-27 10:00:33 UTC (rev 52600)
+++ trunk/blender/source/creator/blender.map 2012-11-27 10:24:18 UTC (rev 52601)
@@ -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*;
};
More information about the Bf-blender-cvs
mailing list