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 | openembedded-core-contrib-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] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure.in | 4 +- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 726ded3..3376600 100644 --- a/configure.in +++ b/configure.in @@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` - WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` +- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` - WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` ++ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client` + WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` video_wayland=yes fi |