Fixes | make[4]: Entering directory '/home/jenkins/oe/world/oe-build/build/tmpfs/work/armv5te-bec-linux-gnueabi/gtk+3/3.22.30-r0/build/gdk/wayland' | make[4]: *** No rule to make target 'pointer-gestures-unstable-v1-client-protocol.h', needed by 'all'. Stop.
Signed-off-by: Khem Raj <raj.k...@gmail.com> --- ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 31 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb | 5 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch new file mode 100644 index 0000000000..3948bdd4e2 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -0,0 +1,31 @@ +From 3bbc4ea83256df8a777e13533e8d2791a70c0ee9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Fri, 20 Jul 2018 22:32:37 -0700 +Subject: [PATCH] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR + +This allows to override the wayland-protocols pkgdatadir with the +WAYLAND_PROTOCOLS_DATADIR from environment. + +pkgconfig would return an absolute path in /usr/share/wayland-protocols +for the pkgdatadir value, which is not suitable for cross-compiling. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7ca7b99..847fa4b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -470,7 +470,8 @@ fi + if test "$enable_wayland_backend" = "yes"; then + # For the cairo image backend + cairo_backends="$cairo_backends cairo" +- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) ++ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) ++ AC_SUBST([WAYLAND_PROTOCOLS_DATADIR]) + GDK_BACKENDS="$GDK_BACKENDS wayland" + GDK_WINDOWING="$GDK_WINDOWING + #define GDK_WINDOWING_WAYLAND" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb b/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb index 697b518544..d1625478ae 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb @@ -6,7 +6,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0001-Hardcoded-libtool.patch \ file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ - " + file://0001-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ + " SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0" SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" @@ -16,3 +17,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" + +EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core