mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

piglit: add a patch to address host contamination for wayland-scanner

Browse Source 
(From OE-Core rev: cb99666b084fc7dc88b0f370b8c920624dbe68f0)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-08-23 15:50:24 +02:00
committed by Richard Purdie
parent d1f4b29b0c
commit 76cc462114
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch Normal file
View File

@@ -0,0 +1,38 @@
From 8f25cdf54e35ab1a174cabf5078784b8e48bda01 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 23 Aug 2024 15:29:45 +0200
Subject: [PATCH] CMakeLists.txt: do not obtain wayland-scanner path from
pkg-config
cmake can only use target wayland-scanner.pc which (correctly) points to /usr/bin/wayland-scanner
However in cross builds it should be using wayland-scanner from native sysroot,
otherwise builds will break if wayland-scanner is not installed on the host
distro.
Upstream-Status: Inappropriate [yocto specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d169fb481..8394f5236 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND)
message(FATAL_ERROR "Failed to find wayland-protocols XML path")
endif()
- pkg_check_modules(WaylandScanner REQUIRED wayland-scanner)
- pkg_get_variable(WaylandScannerPath wayland-scanner wayland_scanner)
- if (NOT WaylandScannerPath)
- message(FATAL_ERROR "Failed to find wayland-scanner path from pkg-config")
- endif()
+ set(WaylandScannerPath wayland-scanner)
add_executable(WaylandScannerExe IMPORTED)
set_property(TARGET WaylandScannerExe PROPERTY IMPORTED_LOCATION ${WaylandScannerPath})
endif()
--
2.39.2

1
meta/recipes-graphics/piglit/piglit_git.bb
View File

@@ -10,6 +10,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \
file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \
"
UPSTREAM_CHECK_COMMITS = "1"