[Bf-blender-cvs] [be8c8b8b9d4] temp-clew-deepbind: Cycles: attempt to avoid OpenCL symbol conflicts with RTLD_DEEPBIND

[Brecht Van Lommel]

Commit: be8c8b8b9d4cf06a1fde3ba39079a85c048dcb9f
Author: Brecht Van Lommel
Date:   Wed May 6 17:58:29 2020 +0200
Branches: temp-clew-deepbind
https://developer.blender.org/rBbe8c8b8b9d4cf06a1fde3ba39079a85c048dcb9f

Cycles: attempt to avoid OpenCL symbol conflicts with RTLD_DEEPBIND

===================================================================

M	extern/clew/src/clew.c
M	extern/cuew/src/cuew.c

===================================================================

diff --git a/extern/clew/src/clew.c b/extern/clew/src/clew.c
index dbdddfc0332..d43deffdf93 100644
--- a/extern/clew/src/clew.c
+++ b/extern/clew/src/clew.c
@@ -23,7 +23,7 @@
     
     typedef void*                   CLEW_DYNLIB_HANDLE;
 
-    #define CLEW_DYNLIB_OPEN(path)  dlopen(path, RTLD_NOW | RTLD_GLOBAL)
+    #define CLEW_DYNLIB_OPEN(path)  dlopen(path, RTLD_NOW | RTLD_DEEPBIND)
     #define CLEW_DYNLIB_CLOSE       dlclose
     #define CLEW_DYNLIB_IMPORT      dlsym
 #endif
diff --git a/extern/cuew/src/cuew.c b/extern/cuew/src/cuew.c
index f477ec48a18..412f8a57b23 100644
--- a/extern/cuew/src/cuew.c
+++ b/extern/cuew/src/cuew.c
@@ -46,7 +46,7 @@ typedef HMODULE DynamicLibrary;
 
 typedef void* DynamicLibrary;
 
-#  define dynamic_library_open(path)         dlopen(path, RTLD_NOW)
+#  define dynamic_library_open(path)         dlopen(path, RTLD_NOW | RTLD_DEEPBIND)
 #  define dynamic_library_close(lib)         dlclose(lib)
 #  define dynamic_library_find(lib, symbol)  dlsym(lib, symbol)
 #endif