diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch deleted file mode 100644 index d065e2285c..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From e53837ad7b01364f34a533b95f4817c1795789de Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | ||
3 | Date: Wed, 20 Feb 2019 16:17:00 -0300 | ||
4 | Subject: [PATCH 1/4] 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 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
15 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
16 | --- | ||
17 | configure.ac | 7 +------ | ||
18 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 1ef68fe68e6..1816a4cd475 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -1854,16 +1854,11 @@ for plat in $platforms; do | ||
25 | fi | ||
26 | WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | ||
27 | |||
28 | - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], | ||
29 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, | ||
30 | - WAYLAND_SCANNER='') | ||
31 | PKG_CHECK_EXISTS([wayland-scanner >= 1.15], | ||
32 | AC_SUBST(SCANNER_ARG, 'private-code'), | ||
33 | AC_SUBST(SCANNER_ARG, 'code')) | ||
34 | |||
35 | - if test "x$WAYLAND_SCANNER" = x; then | ||
36 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
37 | - fi | ||
38 | + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
39 | |||
40 | if test "x$WAYLAND_SCANNER" = "x:"; then | ||
41 | AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) | ||
42 | -- | ||
43 | 2.21.0 | ||
44 | |||