summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2018-10-04 17:24:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-08 14:13:54 +0100
commitb9df2cd7b617c091c3a7a34948106bbe12078c66 (patch)
tree3c5bb3c6bc5ac43c543e5433e72e44db098497c0
parent385f3bf6407c84faffda1cc7b87abc61d1c6b152 (diff)
downloadpoky-b9df2cd7b617c091c3a7a34948106bbe12078c66.tar.gz
piglit: correctly find wayland include dirs
Builds include host /usr/include as the wrong wayland variable was used. The issue only surfaces if CMAKE_SYSROOT is properly set. (From OE-Core rev: d4b942c97831f6717b34caaaf2402efdffa227ba) Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch32
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
new file mode 100644
index 0000000000..5d6ec368ba
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
@@ -0,0 +1,32 @@
1From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Thu, 4 Oct 2018 14:43:17 +0200
4Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
5
6WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
7set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
8when cross compiling.
9
10Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
11
12Upstream-Status: Submitted [piglit@lists.freedesktop.org]
13---
14 tests/util/CMakeLists.txt | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
18index a5f080156..a303a9f58 100644
19--- a/tests/util/CMakeLists.txt
20+++ b/tests/util/CMakeLists.txt
21@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
22 piglit-framework-gl/piglit_wl_framework.c
23 )
24 list(APPEND UTIL_GL_INCLUDES
25- ${WAYLAND_wayland-client_INCLUDEDIR}
26+ ${WAYLAND_INCLUDE_DIRS}
27 )
28 endif()
29 if(PIGLIT_HAS_X11)
30--
312.11.0
32
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index df810a33b4..3292d4cad0 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
5SRC_URI = "git://anongit.freedesktop.org/piglit \ 5SRC_URI = "git://anongit.freedesktop.org/piglit \
6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \ 6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \
7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ 7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
8 file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
8 " 9 "
9UPSTREAM_CHECK_COMMITS = "1" 10UPSTREAM_CHECK_COMMITS = "1"
10 11