diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch new file mode 100644 index 0000000000..b4e3c4995f --- /dev/null +++ b/meta/recipes-graphics/mesa/files/cross-compile-WAYLAND_PROTOCOLS_DATADIR.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR | ||
2 | |||
3 | This allows to override the wayland-protocols pkgdatadir with the | ||
4 | WAYLAND_PROTOCOLS_DATADIR from environment. | ||
5 | |||
6 | pkgconfig would return an absolute path in /usr/share/wayland-protocols | ||
7 | for the pkgdatadir value, which is not suitable for cross-compiling. | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Index: mesa-18.1.2/configure.ac | ||
13 | =================================================================== | ||
14 | --- mesa-18.1.2.orig/configure.ac | ||
15 | +++ mesa-18.1.2/configure.ac | ||
16 | @@ -1808,7 +1808,7 @@ for plat in $platforms; do | ||
17 | PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED]) | ||
18 | PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED]) | ||
19 | PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) | ||
20 | - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | ||
21 | + PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) | ||
22 | |||
23 | AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) | ||
24 | |||