diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch | 50 |
1 files changed, 50 insertions, 0 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 @@ | |||
1 | From cc6fce587f2628c8b342764e06fb0fc27c1e8274 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Mon, 3 Aug 2015 20:33:44 -0700 | ||
4 | Subject: [PATCH] configure.ac: add arg --with-libunwind | ||
5 | |||
6 | Add arg --with-libunwind for configure so it's optional to check | ||
7 | libunwind, which is helpfull to make deterministic builds. | ||
8 | |||
9 | Upstream-Status: Submitted [wayland-devel] | ||
10 | |||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | --- | ||
13 | configure.ac | 19 ++++++++++++++----- | ||
14 | 1 file changed, 14 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 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 | -- | ||
49 | 2.3.5 | ||
50 | |||