[OE-core] [PATCH 1/2] piglit: correctly find wayland include dirs

[Khem Raj]

On Thu, Oct 4, 2018 at 8:24 AM Pascal Bach <pascal.bach at siemens.com> wrote:
>
> Builds include host /usr/include as the wrong wayland variable was used.
> The issue only surfaces if CMAKE_SYSROOT is properly set.
>


this seems fine

> Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
> ---
>  ...-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch | 32 ++++++++++++++++++++++
>  meta/recipes-graphics/piglit/piglit_git.bb         |  1 +
>  2 files changed, 33 insertions(+)
>  create mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
>
> 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 @@
> +From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001
> +From: Pascal Bach <pascal.bach at siemens.com>
> +Date: Thu, 4 Oct 2018 14:43:17 +0200
> +Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
> +
> +WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
> +set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
> +when cross compiling.
> +
> +Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
> +
> +Upstream-Status: Submitted [piglit at lists.freedesktop.org]
> +---
> + tests/util/CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
> +index a5f080156..a303a9f58 100644
> +--- a/tests/util/CMakeLists.txt
> ++++ b/tests/util/CMakeLists.txt
> +@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
> +                       piglit-framework-gl/piglit_wl_framework.c
> +               )
> +               list(APPEND UTIL_GL_INCLUDES
> +-                      ${WAYLAND_wayland-client_INCLUDEDIR}
> ++                      ${WAYLAND_INCLUDE_DIRS}
> +               )
> +       endif()
> +       if(PIGLIT_HAS_X11)
> +--
> +2.11.0
> +
> 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"
>  SRC_URI = "git://anongit.freedesktop.org/piglit \
>             file://0001-cmake-install-bash-completions-in-the-right-place.patch \
>             file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
> +           file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
>             "
>  UPSTREAM_CHECK_COMMITS = "1"
>
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core