diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-23 12:37:37 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-16 11:18:17 +0100 |
commit | f035e027a97ee7e8fe6eb6c303b9c06dec085b46 (patch) | |
tree | bf07b083c9d5762fdebf889db38144ba1acb905c /meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch | |
parent | 925a200265474d155e92cbe57c21676d2f55c000 (diff) | |
download | poky-f035e027a97ee7e8fe6eb6c303b9c06dec085b46.tar.gz |
weston: backport patch for libunwind configure option and disable it
* it's autodetected from sysroot and runtime dependency on libunwind isn't
deterministic
* master has weston 1.1.0 which already has this option and also explicitly
disables libunwind
(From OE-Core rev: f1297d0ad9356f34e29ccabdd6d4c21b2fd4f27f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch b/meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch new file mode 100644 index 0000000000..faf96806d5 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From cc802f5f34c6ea4fe66f70225830c97ef7abbfc3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Quentin Glidic <sardemff7+git@sardemff7.net> | ||
3 | Date: Wed, 3 Apr 2013 20:19:45 +0200 | ||
4 | Subject: [PATCH] autotools: Add a libunwind configure switch | ||
5 | |||
6 | Upstream-Status: Backport from 1.1 (5daccc373eddf94086fcc4662c38605de6356c6c) | ||
7 | |||
8 | Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> | ||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 12 +++++++----- | ||
12 | 1 file changed, 7 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 71d0978..1e76ded 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -251,12 +251,14 @@ fi | ||
19 | AC_SUBST(GCC_CFLAGS) | ||
20 | AC_SUBST(GCC_CXXFLAGS) | ||
21 | |||
22 | -PKG_CHECK_MODULES(LIBUNWIND, libunwind, | ||
23 | - [have_libunwind=yes], [have_libunwind=no]) | ||
24 | -if test "x$have_libunwind" = xyes; then | ||
25 | - AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) | ||
26 | +AC_ARG_ENABLE(libunwind, AS_HELP_STRING([ --disable-libunwind], | ||
27 | + [Disable libunwind usage for backtraces]),, | ||
28 | + enable_libunwind=yes) | ||
29 | +if test "x$enable_libunwind" = xyes; then | ||
30 | + PKG_CHECK_MODULES(LIBUNWIND, libunwind) | ||
31 | + AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) | ||
32 | fi | ||
33 | -AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$have_libunwind" = xyes]) | ||
34 | +AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$enable_libunwind" = xyes]) | ||
35 | |||
36 | WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) | ||
37 | |||
38 | -- | ||
39 | 1.8.3.2 | ||
40 | |||