diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-12-06 01:19:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:22 +0000 |
commit | 94c29c100873fd8606ad60f194c9b9e7c7a71e85 (patch) | |
tree | cfd2c76737c8272838173c1a7628f20d935490a2 /meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch | |
parent | 00c691465cb770a9c48cbc9749c4e515d56acca0 (diff) | |
download | poky-94c29c100873fd8606ad60f194c9b9e7c7a71e85.tar.gz |
libsdl2: fix build on wayland(-dev)less hosts
* add sysroot prefix to wayland core protocols
* do not use pkg-config to find wayland-scanner
(From OE-Core rev: a8e7c5b415b99973c39a7ddd57cae45695fb0119)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch index d042430b56..efc84188f3 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch | |||
@@ -11,18 +11,20 @@ Upstream-Status: Inappropriate [embedded specific] | |||
11 | 11 | ||
12 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 12 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
13 | --- | 13 | --- |
14 | configure.in | 2 +- | 14 | configure.in | 4 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/configure.in b/configure.in | 17 | diff --git a/configure.in b/configure.in |
18 | index 726ded3..3376600 100644 | 18 | index 726ded3..3376600 100644 |
19 | --- a/configure.in | 19 | --- a/configure.in |
20 | +++ b/configure.in | 20 | +++ b/configure.in |
21 | @@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for | 21 | @@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for |
22 | WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` | ||
22 | WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` | 23 | WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` |
23 | WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` | 24 | WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` |
24 | WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` | 25 | - WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` |
25 | - WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | 26 | - WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` |
27 | + WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client` | ||
26 | + WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` | 28 | + WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` |
27 | video_wayland=yes | 29 | video_wayland=yes |
28 | fi | 30 | fi |