diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-23 12:37:37 +0200 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-16 10:39:49 +0100 |
| commit | f1297d0ad9356f34e29ccabdd6d4c21b2fd4f27f (patch) | |
| tree | 3f1195c29c6dfb1a2c4016f9e9da41b8bc06601e | |
| parent | b8592741fa380f5b806b7cf19313fa1351c6af97 (diff) | |
| download | openembedded-core-f1297d0ad9356f34e29ccabdd6d4c21b2fd4f27f.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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/recipes-graphics/wayland/weston/0001-autotools-Add-a-libunwind-configure-switch.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_1.0.6.bb | 3 |
2 files changed, 42 insertions, 1 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 @@ +From cc802f5f34c6ea4fe66f70225830c97ef7abbfc3 Mon Sep 17 00:00:00 2001 +From: Quentin Glidic <sardemff7+git@sardemff7.net> +Date: Wed, 3 Apr 2013 20:19:45 +0200 +Subject: [PATCH] autotools: Add a libunwind configure switch + +Upstream-Status: Backport from 1.1 (5daccc373eddf94086fcc4662c38605de6356c6c) + +Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 71d0978..1e76ded 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -251,12 +251,14 @@ fi + AC_SUBST(GCC_CFLAGS) + AC_SUBST(GCC_CXXFLAGS) + +-PKG_CHECK_MODULES(LIBUNWIND, libunwind, +- [have_libunwind=yes], [have_libunwind=no]) +-if test "x$have_libunwind" = xyes; then +- AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) ++AC_ARG_ENABLE(libunwind, AS_HELP_STRING([ --disable-libunwind], ++ [Disable libunwind usage for backtraces]),, ++ enable_libunwind=yes) ++if test "x$enable_libunwind" = xyes; then ++ PKG_CHECK_MODULES(LIBUNWIND, libunwind) ++ AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) + fi +-AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$have_libunwind" = xyes]) ++AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$enable_libunwind" = xyes]) + + WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) + +-- +1.8.3.2 + diff --git a/meta/recipes-graphics/wayland/weston_1.0.6.bb b/meta/recipes-graphics/wayland/weston_1.0.6.bb index cb41e05c46..9dea495ebd 100644 --- a/meta/recipes-graphics/wayland/weston_1.0.6.bb +++ b/meta/recipes-graphics/wayland/weston_1.0.6.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ file://src/compositor.c;endline=23;md5=aa98a8db03480fe7d500d0b1f4b8850c" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-autotools-Add-a-libunwind-configure-switch.patch \ file://weston.png \ file://weston.desktop" SRC_URI[md5sum] = "63202129d66d5514e572814da5dfa1f7" @@ -17,7 +18,7 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 mtdev jpeg" DEPENDS += "wayland mesa virtual/egl" EXTRA_OECONF = "--disable-android-compositor --enable-setuid-install" -EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland" +EXTRA_OECONF += "--disable-tablet-shell --disable-xwayland --disable-libunwind" EXTRA_OECONF += "--enable-simple-clients --enable-clients --disable-simple-egl-clients" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms wayland', '', d)} \ |