summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2015-08-05 12:19:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:23 -0700
commitb698e2efa617b36a03b83afdc4f7b4d046c2bd70 (patch)
tree1e4f8f0025bb1986449210f1b11457e01715a12a /meta/recipes-graphics/wayland
parentfcc3afcdb20e1dca72c39b66a5553f42637c7be2 (diff)
downloadpoky-b698e2efa617b36a03b83afdc4f7b4d046c2bd70.tar.gz
libinput: add configure arg and PACKAGECONFIG for libunwind
libinput uses pkg-config to check and decide whether to build with libunwind, which causes undeterministic builds or error: | tmp/work/core2-64-wrs-linux/libinput/0.18.0-r0/libinput-0.18.0/test/litest.c:77:23: | fatal error: libunwind.h: No such file or directory So add configure arg and PACKAGECONFIG for libunwind to make deterministic build, but libunwind is disabled by default. (From OE-Core rev: 3ffbceb4394a54c4b02fa66525b2a00832d4e7f1) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch50
-rw-r--r--meta/recipes-graphics/wayland/libinput_0.18.0.bb7
2 files changed, 56 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch b/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
new file mode 100644
index 0000000000..df5ebcca05
--- /dev/null
+++ b/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch
@@ -0,0 +1,50 @@
1From cc6fce587f2628c8b342764e06fb0fc27c1e8274 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Mon, 3 Aug 2015 20:33:44 -0700
4Subject: [PATCH] configure.ac: add arg --with-libunwind
5
6Add arg --with-libunwind for configure so it's optional to check
7libunwind, which is helpfull to make deterministic builds.
8
9Upstream-Status: Submitted [wayland-devel]
10
11Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
12---
13 configure.ac | 19 ++++++++++++++-----
14 1 file changed, 14 insertions(+), 5 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 314b0d4..242d251 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -60,13 +60,22 @@ PKG_PROG_PKG_CONFIG()
21 PKG_CHECK_MODULES(MTDEV, [mtdev >= 1.1.0])
22 PKG_CHECK_MODULES(LIBUDEV, [libudev])
23 PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
24-PKG_CHECK_MODULES(LIBUNWIND,
25+
26+AC_ARG_WITH(libunwind,
27+ AS_HELP_STRING([--without-libunwind],[Do not use libunwind]))
28+
29+AS_IF([test "x$with_libunwind" != "xno"],
30+ [PKG_CHECK_MODULES(LIBUNWIND,
31 [libunwind],
32 [HAVE_LIBUNWIND=yes],
33- [HAVE_LIBUNWIND=no])
34-if test "x$HAVE_LIBUNWIND" = "xyes"; then
35- AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])
36-fi
37+ [HAVE_LIBUNWIND=no])],
38+ [HAVE_LIBUNWIND=no])
39+
40+AS_IF([test "x$HAVE_LIBUNWIND" = "xyes"],
41+ [AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])],
42+ [AS_IF([test "x$with_libunwind" = "xyes"],
43+ [AC_MSG_ERROR([libunwind requested but not found])])])
44+
45 AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes])
46 AC_PATH_PROG(ADDR2LINE, [addr2line])
47 if test "x$ADDR2LINE" != "x"; then
48--
492.3.5
50
diff --git a/meta/recipes-graphics/wayland/libinput_0.18.0.bb b/meta/recipes-graphics/wayland/libinput_0.18.0.bb
index 0fe1c6c59b..8e8e6a7c41 100644
--- a/meta/recipes-graphics/wayland/libinput_0.18.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_0.18.0.bb
@@ -7,11 +7,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f"
7 7
8DEPENDS = "libevdev udev mtdev" 8DEPENDS = "libevdev udev mtdev"
9 9
10SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" 10SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
11 file://libinput-configure.ac-add-arg-with-libunwind.patch \
12"
11SRC_URI[md5sum] = "0ddbb0d53d58dec0a86de6791560011a" 13SRC_URI[md5sum] = "0ddbb0d53d58dec0a86de6791560011a"
12SRC_URI[sha256sum] = "64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda" 14SRC_URI[sha256sum] = "64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda"
13 15
14inherit autotools pkgconfig 16inherit autotools pkgconfig
15 17
18PACKAGECONFIG ??= ""
19PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
20
16FILES_${PN} += "${libdir}/udev/" 21FILES_${PN} += "${libdir}/udev/"
17FILES_${PN}-dbg += "${libdir}/udev/.debug" 22FILES_${PN}-dbg += "${libdir}/udev/.debug"