summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/renderdoc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-12-21 10:20:15 +0000
committerKhem Raj <raj.khem@gmail.com>2023-12-21 08:20:34 -0800
commitfc035a8c4dc84e7414a5a06a0949c514fdc69531 (patch)
treeb4e541af0e06c7bbd40894992d876bde0efea750 /meta-oe/recipes-graphics/renderdoc
parentc3ac5cf180f960dbbf6e3a3e76d6d44094873c72 (diff)
downloadmeta-openembedded-fc035a8c4dc84e7414a5a06a0949c514fdc69531.tar.gz
renderdoc: no need to depend on vim-native
Remove the patch to bring back the user of xxd from vim-native, the patch claimed that the cross-compiling rules were broken. However they work just fine if you tell it what compiler to use, as the default is "c++" and that isn't in HOSTTOOLS. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/renderdoc')
-rw-r--r--meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch57
-rw-r--r--meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb2
2 files changed, 1 insertions, 58 deletions
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
deleted file mode 100644
index e96dedfc3..000000000
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
2From: Adrian Ratiu <adrian.ratiu@collabora.com>
3Date: Tue, 24 Sep 2019 16:07:18 +0300
4Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
5
6Renderdoc's attempt to cross compile an xxd replacement by directly
7calling a host cross-compiler breaks under OE's recipe specific
8sysroots protection because this is not a native recipe, so we just
9use xxd-native instead.
10
11Upstream-Status: Inappropriate [embedded-specific]
12
13---
14 renderdoc/CMakeLists.txt | 23 +----------------------
15 1 file changed, 1 insertion(+), 22 deletions(-)
16
17diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
18index 5cb7440a4..453a034ba 100644
19--- a/renderdoc/CMakeLists.txt
20+++ b/renderdoc/CMakeLists.txt
21@@ -370,26 +370,6 @@ set(data
22 set(data_objects)
23
24 if(UNIX)
25- # If we're cross-compiling, include-bin will get built for the target and we
26- # then can't execute it. Instead, we force calling c++ (which we can safely
27- # assume is present) directly to build the binary
28-
29- if(CMAKE_CROSSCOMPILING)
30- set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++")
31-
32- add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
33- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
34- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
35- COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
36- DEPENDS 3rdparty/include-bin/main.cpp)
37- set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
38- set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
39- else()
40- add_executable(include-bin 3rdparty/include-bin/main.cpp)
41- set(INCLUDE_BIN_EXE $<TARGET_FILE:include-bin>)
42- set(INCLUDE_BIN_DEP include-bin)
43- endif()
44-
45 foreach(res ${data})
46 set(in ${res})
47 set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
48@@ -399,8 +379,7 @@ if(UNIX)
49 add_custom_command(OUTPUT ${out_src}
50 WORKING_DIRECTORY ${working_dir}
51 COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
52- COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
53- DEPENDS ${INCLUDE_BIN_DEP}
54+ COMMAND xxd -i ${in} ${out_src}
55 DEPENDS ${res})
56
57 list(APPEND data_objects ${out_src})
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb
index c89b2d1c9..e52ec5f29 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d"
7SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" 7SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f"
8SRC_URI = " \ 8SRC_URI = " \
9 git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ 9 git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \
10 file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
11" 10"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13 12
@@ -32,6 +31,7 @@ EXTRA_OECMAKE += "\
32 -DENABLE_PYRENDERDOC=OFF \ 31 -DENABLE_PYRENDERDOC=OFF \
33 -DENABLE_RENDERDOCCMD=ON \ 32 -DENABLE_RENDERDOCCMD=ON \
34 -DCMAKE_BUILD_TYPE=Release \ 33 -DCMAKE_BUILD_TYPE=Release \
34 -DHOST_NATIVE_CPP_COMPILER="${BUILD_CXX}" \
35" 35"
36 36
37FILES:${PN} += "${libdir}" 37FILES:${PN} += "${libdir}"