* [PATCH 1/2] piglit: correctly find wayland include dirs
@ 2018-10-04 15:24 Pascal Bach
2018-10-04 15:24 ` [PATCH 2/2] piglit: inherit pkgconfig Pascal Bach
2018-10-04 23:03 ` [PATCH 1/2] piglit: correctly find wayland include dirs Khem Raj
0 siblings, 2 replies; 3+ messages in thread
From: Pascal Bach @ 2018-10-04 15:24 UTC (permalink / raw)
To: openembedded-core
Builds include host /usr/include as the wrong wayland variable was used.
The issue only surfaces if CMAKE_SYSROOT is properly set.
Signed-off-by: Pascal Bach <pascal.bach@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@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@siemens.com>
+
+Upstream-Status: Submitted [piglit@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] piglit: inherit pkgconfig
2018-10-04 15:24 [PATCH 1/2] piglit: correctly find wayland include dirs Pascal Bach
@ 2018-10-04 15:24 ` Pascal Bach
2018-10-04 23:03 ` [PATCH 1/2] piglit: correctly find wayland include dirs Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Pascal Bach @ 2018-10-04 15:24 UTC (permalink / raw)
To: openembedded-core
The CMakeLists.txt of piglit uses pkgconfig internally.
This makes sure pkgconfig-native is available in any case.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 3292d4cad0..9e45751648 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native virtual/egl"
-inherit cmake python3native distro_features_check bash-completion
+inherit cmake pkgconfig python3native distro_features_check bash-completion
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] piglit: correctly find wayland include dirs
2018-10-04 15:24 [PATCH 1/2] piglit: correctly find wayland include dirs Pascal Bach
2018-10-04 15:24 ` [PATCH 2/2] piglit: inherit pkgconfig Pascal Bach
@ 2018-10-04 23:03 ` Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2018-10-04 23:03 UTC (permalink / raw)
To: Pascal Bach; +Cc: Patches and discussions about the oe-core layer
On Thu, Oct 4, 2018 at 8:24 AM Pascal Bach <pascal.bach@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@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@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@siemens.com>
> +
> +Upstream-Status: Submitted [piglit@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-04 23:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-04 15:24 [PATCH 1/2] piglit: correctly find wayland include dirs Pascal Bach
2018-10-04 15:24 ` [PATCH 2/2] piglit: inherit pkgconfig Pascal Bach
2018-10-04 23:03 ` [PATCH 1/2] piglit: correctly find wayland include dirs Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox