diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.xz |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch')
-rw-r--r-- | yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch b/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch new file mode 100644 index 000000000..df5ebcca0 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch @@ -0,0 +1,50 @@ +From cc6fce587f2628c8b342764e06fb0fc27c1e8274 Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Mon, 3 Aug 2015 20:33:44 -0700 +Subject: [PATCH] configure.ac: add arg --with-libunwind + +Add arg --with-libunwind for configure so it's optional to check +libunwind, which is helpfull to make deterministic builds. + +Upstream-Status: Submitted [wayland-devel] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + configure.ac | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 314b0d4..242d251 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,13 +60,22 @@ PKG_PROG_PKG_CONFIG() + PKG_CHECK_MODULES(MTDEV, [mtdev >= 1.1.0]) + PKG_CHECK_MODULES(LIBUDEV, [libudev]) + PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4]) +-PKG_CHECK_MODULES(LIBUNWIND, ++ ++AC_ARG_WITH(libunwind, ++ AS_HELP_STRING([--without-libunwind],[Do not use libunwind])) ++ ++AS_IF([test "x$with_libunwind" != "xno"], ++ [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]) +-fi ++ [HAVE_LIBUNWIND=no])], ++ [HAVE_LIBUNWIND=no]) ++ ++AS_IF([test "x$HAVE_LIBUNWIND" = "xyes"], ++ [AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])], ++ [AS_IF([test "x$with_libunwind" = "xyes"], ++ [AC_MSG_ERROR([libunwind requested but not found])])]) ++ + AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes]) + AC_PATH_PROG(ADDR2LINE, [addr2line]) + if test "x$ADDR2LINE" != "x"; then +-- +2.3.5 + |