diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch new file mode 100644 index 0000000000..e7585060ac --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 135f6ae990df9abe3765ed339f76c55026c86fe5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 | ||
4 | Subject: [PATCH 2/7] Simplify wayland-scanner lookup | ||
5 | Organization: O.S. Systems Software LTDA. | ||
6 | |||
7 | Don't use pkg-config to lookup the path of a binary that's in the path. | ||
8 | |||
9 | Alternatively we'd have to prefix the path returned by pkg-config with | ||
10 | PKG_CONFIG_SYSROOT_DIR. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
14 | --- | ||
15 | configure.ac | 7 +------ | ||
16 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index f1fbdcc6c7..7c95598afc 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -1796,12 +1796,7 @@ for plat in $platforms; do | ||
23 | PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) | ||
24 | WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | ||
25 | |||
26 | - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], | ||
27 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, | ||
28 | - WAYLAND_SCANNER='') | ||
29 | - if test "x$WAYLAND_SCANNER" = x; then | ||
30 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
31 | - fi | ||
32 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
33 | |||
34 | if test "x$WAYLAND_SCANNER" = "x:"; then | ||
35 | AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) | ||
36 | -- | ||
37 | 2.17.1 | ||
38 | |||