diff options
Diffstat (limited to 'meta-amd-bsp/recipes-devtools/codexl/codexl/0014-do-not-use-local-tinyxml.patch')
-rw-r--r-- | meta-amd-bsp/recipes-devtools/codexl/codexl/0014-do-not-use-local-tinyxml.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-devtools/codexl/codexl/0014-do-not-use-local-tinyxml.patch b/meta-amd-bsp/recipes-devtools/codexl/codexl/0014-do-not-use-local-tinyxml.patch new file mode 100644 index 00000000..896dfd38 --- /dev/null +++ b/meta-amd-bsp/recipes-devtools/codexl/codexl/0014-do-not-use-local-tinyxml.patch @@ -0,0 +1,107 @@ +From a0af2e4f825e4036472fe8047cfb470528fe9a10 Mon Sep 17 00:00:00 2001 +From: Michael <michael_powell@mentor.com> +Date: Wed, 26 Oct 2016 20:46:16 -0700 +Subject: [PATCH] do not use local tinyxml + +--- + Common/Src/SCons/CXL_init.py | 29 +++++++++++++++++++++++------ + CodeXL/Components/Graphics/Server/VulkanEnv/SConscript | 4 ++-- + CodeXL/Components/Graphics/Server/VulkanServer/SConscript | 4 ++-- + 3 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/Common/Src/SCons/CXL_init.py b/Common/Src/SCons/CXL_init.py +index af3dfac..5cb1336 100755 +--- a/Common/Src/SCons/CXL_init.py ++++ b/Common/Src/SCons/CXL_init.py +@@ -82,6 +82,18 @@ def initCXLVars (CXL_vars) : + default = 'true', + allowed_values = ('true', '')) + ++ # CxL support for external tinyxml ++ CXL_vars.Add( ++ key = 'CXL_tinyxml_dir', ++ help = 'Specify tinyXML directory to use', ++ default = '',) ++ ++ # CxL support for external tinyxml include ++ CXL_vars.Add( ++ key = 'CXL_tinyxml_inc_dir', ++ help = 'Specify tinyXML include directory to use', ++ default = '',) ++ + # CxL support for system_boost + CXL_vars.Add( + key = 'CXL_boost_dir', +@@ -465,16 +477,21 @@ def initStdc(env): + copySharedLibrary(env, file, stdclib_lib, env['CXL_lib_dir']) + + def initTinyXml (env) : +- dbgSuffix = '' ++ if (env['CXL_tinyxml_dir'] == ''): ++ tinyxml_dir = env['CXL_common_dir'] + '/Lib/Ext/tinyxml/2.6.2' ++ tinyxml_inc = tinyxml_dir ++ tinyxml_lib = tinyxml_dir + '/Build/CentOS64/' + env['CXL_build'] + '/' + env['CXL_arch'] ++ tinyxml_libs = ['tinyXML'] ++ else: ++ tinyxml_dir = env['CXL_tinyxml_dir'] ++ tinyxml_lib = tinyxml_dir ++ tinyxml_inc = env['CXL_tinyxml_inc_dir'] ++ tinyxml_libs = ['tinyxml'] + +- tinyxml_dir = env['CXL_common_dir'] + '/Lib/Ext/tinyxml/2.6.2' +- tinyxml_inc = tinyxml_dir +- tinyxml_lib = tinyxml_dir + '/Build/CentOS64/' + env['CXL_build'] + '/' + env['CXL_arch'] + libsrc = [] +- tinyxml_libs = ['tinyXML'] + libsrc.append(tinyxml_libs) + + env.Append(CXL_TinyXML_inc = [tinyxml_dir, tinyxml_inc]) + env.Append(CXL_TinyXML_libs = tinyxml_libs) + env.Append(CXL_TinyXML_libpath = tinyxml_lib) + # We do not need to install anything - it is just a single archive +diff --git a/CodeXL/Components/Graphics/Server/VulkanEnv/SConscript b/CodeXL/Components/Graphics/Server/VulkanEnv/SConscript +index e07a583..2ba2d20 100644 +--- a/CodeXL/Components/Graphics/Server/VulkanEnv/SConscript ++++ b/CodeXL/Components/Graphics/Server/VulkanEnv/SConscript +@@ -31,7 +31,7 @@ linker_flags = ' -Wl,-z,defs ' + env.Prepend(LINKFLAGS = linker_flags) + + # These need to be in their dependency order, with most derived first +-env['LIBS'] = \ ++env.Append (LIBS = \ + [ + #local libraries + "libCXLGraphicsServerCommon", +@@ -41,7 +41,7 @@ env['LIBS'] = \ + "dl", + "rt", + "pthread", +-] ++]) + + # Vulkan specific source files + sources = \ +diff --git a/CodeXL/Components/Graphics/Server/VulkanServer/SConscript b/CodeXL/Components/Graphics/Server/VulkanServer/SConscript +index 28ca379..5b2266d 100644 +--- a/CodeXL/Components/Graphics/Server/VulkanServer/SConscript ++++ b/CodeXL/Components/Graphics/Server/VulkanServer/SConscript +@@ -51,7 +51,7 @@ linker_flags = ' -Wl,-z,defs ' + env.Prepend(LINKFLAGS = linker_flags)
+
+ # These need to be in their dependency order, with most derived first
+-env['LIBS'] = \
++env.Append (LIBS = \
+ [
+ #local libraries
+ "libCXLGraphicsServerCommon",
+@@ -65,7 +65,7 @@ env['LIBS'] = \ + "dl",
+ "rt",
+ "pthread",
+-]
++])
+
+ # Vulkan specific source files
+ sources = \
+-- +2.5.5 |