diff options
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch deleted file mode 100644 index 5f4d79c38c..0000000000 --- a/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 3 | Date: Wed, 11 May 2016 16:16:30 +0300 | ||
| 4 | Subject: [PATCH] configure.ac: Fix wayland-protocols path | ||
| 5 | |||
| 6 | The wayland-protocols directory is used during build: Fix the path | ||
| 7 | to point to sysroot specified in recipe. | ||
| 8 | |||
| 9 | Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that | ||
| 10 | breaks multilib weston as it would point to multilib sysroot when the | ||
| 11 | (allarch) wayland-protocols is actually in the machine sysroot. | ||
| 12 | |||
| 13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 14 | Upstream-Status: Inappropriate [embedded specific] | ||
| 15 | --- | ||
| 16 | configure.ac | 2 +- | ||
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 18 | |||
| 19 | --- a/configure.ac | ||
| 20 | +++ b/configure.ac | ||
| 21 | @@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib | ||
| 22 | PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) | ||
| 23 | |||
| 24 | PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7], | ||
| 25 | - [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) | ||
| 26 | + [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) | ||
| 27 | AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) | ||
| 28 | |||
| 29 | AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, | ||
