mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

vk-gl-cts: use cmake-qemu

Browse Source 
Don't configure qemu+cmake manually, use the cmake-qemu class.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ross Burton
2024-12-09 17:26:24 +00:00
committed by Khem Raj
parent e0702daf8e
commit 7529a85b9a
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
+1 -13
View File
@@ -19,7 +19,7 @@ SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_video
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit pkgconfig cmake features_check python3native qemu inherit pkgconfig cmake cmake-qemu features_check python3native
UPSTREAM_CHECK_GITTAGREGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_GITTAGREGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
@@ -42,7 +42,6 @@ SRC_URI:append:toolchain-clang = "\
" "
EXTRA_OECMAKE += "-DAMBER_DISABLE_WERROR=ON \ EXTRA_OECMAKE += "-DAMBER_DISABLE_WERROR=ON \
-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
-DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \ -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
-DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols" -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols"
@@ -58,17 +57,6 @@ PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,su
PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx" PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx"
PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx" PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx"
do_configure:append() {
# Write out a qemu wrapper that will be used by cmake
# so that it can run target helper binaries through that.
qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
cat > ${WORKDIR}/qemuwrapper << EOF
#!/bin/sh
$qemu_binary "\$@"
EOF
chmod +x ${WORKDIR}/qemuwrapper
}
python __anonymous() { python __anonymous() {
# if the user doesn't specify any PACKAGECONFIG then the cts build system # if the user doesn't specify any PACKAGECONFIG then the cts build system
# is going to probe the sysroot to try to figure out what to build # is going to probe the sysroot to try to figure out what to build