1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-devtools/codexl/codexl/0013-do-not-use-local-libGLEW.patch b/meta-amd-bsp/recipes-devtools/codexl/codexl/0013-do-not-use-local-libGLEW.patch
new file mode 100644
index 00000000..9b68f606
--- /dev/null
+++ b/meta-amd-bsp/recipes-devtools/codexl/codexl/0013-do-not-use-local-libGLEW.patch
@@ -0,0 +1,55 @@
+From 764b1b29ab720fc3fed6e2f183facf43e69d8ed5 Mon Sep 17 00:00:00 2001
+From: Michael <michael_powell@mentor.com>
+Date: Thu, 13 Oct 2016 08:38:01 -0700
+Subject: [PATCH] do not use local libGLEW
+
+---
+ Common/Src/SCons/CXL_init.py | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/Common/Src/SCons/CXL_init.py b/Common/Src/SCons/CXL_init.py
+index 199c813..af3dfac
+--- a/Common/Src/SCons/CXL_init.py
++++ b/Common/Src/SCons/CXL_init.py
+@@ -75,6 +75,13 @@ def initCXLVars (CXL_vars) :
+         default = '',
+         allowed_values = ('true', ''))
+ 
++    # CxL support for internal libGLEW
++    CXL_vars.Add(
++        key = 'CXL_USE_INTERNAL_LIB_GLEW',
++        help = 'Support internal libGLEW',
++        default = 'true',
++        allowed_values = ('true', ''))
++
+     # CxL support for system_boost
+     CXL_vars.Add(
+         key = 'CXL_boost_dir',
+@@ -568,16 +575,17 @@ def initAMDOpenCL (env) :
+     copySharedLibrary(env, file, amdopencl_lib, env['CXL_lib_dir']) 
+ 
+ def initGLEW (env) :
+-    amdglew_dir =  env['CXL_common_dir'] + '/Lib/Ext/glew/1.9.0/Build/Ubuntu'
++    if (env['CXL_USE_INTERNAL_LIB_GLEW'] == 'true'):
++      amdglew_dir =  env['CXL_common_dir'] + '/Lib/Ext/glew/1.9.0/Build/Ubuntu'
+ 
+-    if (env['CXL_arch'] == 'x86_64'):
+-        amdglew_dir = amdglew_dir + '/x86_64/'
+-    else:
+-        amdglew_dir = amdglew_dir + '/x86/'
++      if (env['CXL_arch'] == 'x86_64'):
++          amdglew_dir = amdglew_dir + '/x86_64/'
++      else:
++          amdglew_dir = amdglew_dir + '/x86/'
+ 
+-    copySharedLibrary(env, "libGLEW.so.1.9.0", amdglew_dir, env['CXL_lib_dir']) 
+-    copySharedLibrary(env, "libGLEW.so.1.9", amdglew_dir, env['CXL_lib_dir']) 
+-    copySharedLibrary(env, "libGLEW.so", amdglew_dir, env['CXL_lib_dir']) 
++      copySharedLibrary(env, "libGLEW.so.1.9.0", amdglew_dir, env['CXL_lib_dir']) 
++      copySharedLibrary(env, "libGLEW.so.1.9", amdglew_dir, env['CXL_lib_dir']) 
++      copySharedLibrary(env, "libGLEW.so", amdglew_dir, env['CXL_lib_dir']) 
+ 
+ def initBoost (env) :
+     if (env['CXL_boost_dir'] == ''):
+-- 
+2.5.5