summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libunwind
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-05-11 10:35:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:31 +0100
commit26698cdfc966ce771dbb4d172c31261ff78ec315 (patch)
tree726a53c530ce5c4991a7bf2eec7574a2bce4b2e1 /meta/recipes-support/libunwind
parentf3c90e12b1d4c421946686e9e64fbc8eb9ca8131 (diff)
downloadpoky-26698cdfc966ce771dbb4d172c31261ff78ec315.tar.gz
libunwind: Add a confgure option for tests
Tests dont compile on musl due to its use of {get|set}context APIs, adding this option to disable tests helps it to compile (From OE-Core rev: 026f14c1353b599546cec24b6b779ff872ff890e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libunwind')
-rw-r--r--meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch69
-rw-r--r--meta/recipes-support/libunwind/libunwind_git.bb5
2 files changed, 72 insertions, 2 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch b/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
new file mode 100644
index 0000000000..673a5bb995
--- /dev/null
+++ b/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
@@ -0,0 +1,69 @@
1From 459e471fcc33d300f7bbcdaf3e0dc338d9dc15b9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 16:56:34 +0000
4Subject: [PATCH] add knobs to disable/enable tests
5
6Some tests do not compile on musl libc
7in general its good to have such a knob
8since not all builds may want to enable
9tests
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 Makefile.am | 6 +++++-
16 configure.ac | 12 ++++++++++--
17 2 files changed, 15 insertions(+), 3 deletions(-)
18
19diff --git a/Makefile.am b/Makefile.am
20index 6a3ed9e..0c29b3e 100644
21--- a/Makefile.am
22+++ b/Makefile.am
23@@ -42,7 +42,11 @@ endif
24
25 nodist_include_HEADERS = include/libunwind-common.h
26
27-SUBDIRS = src tests
28+SUBDIRS = src
29+
30+if CONFIG_TESTS
31+SUBDIRS += tests
32+endif
33
34 if CONFIG_DOCS
35 SUBDIRS += doc
36diff --git a/configure.ac b/configure.ac
37index 85d78f8..d362387 100644
38--- a/configure.ac
39+++ b/configure.ac
40@@ -129,6 +129,10 @@ AC_ARG_ENABLE(documentation,
41 AS_HELP_STRING([--disable-documentation],[Disable generating the man pages]),,
42 [enable_documentation=yes])
43
44+AC_ARG_ENABLE(tests,
45+ AS_HELP_STRING([--disable-tests],[Disable building tests]),,
46+ [enable_tests=yes])
47+
48 AC_MSG_CHECKING([if we should build libunwind-setjmp])
49 AC_MSG_RESULT([$enable_setjmp])
50
51@@ -395,9 +399,13 @@ AM_CONDITIONAL([CONFIG_DOCS], [test x$enable_documentation = xyes])
52 if test "x$enable_documentation" = "xyes"; then
53 AC_CONFIG_FILES(doc/Makefile doc/common.tex)
54 fi
55+AM_CONDITIONAL([CONFIG_TESTS], [test x$enable_tests = xyes])
56+if test "x$enable_tests" = "xyes"; then
57+ AC_CONFIG_FILES(tests/Makefile tests/check-namespace.sh)
58+fi
59+
60
61-AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
62- include/libunwind-common.h
63+AC_CONFIG_FILES(Makefile src/Makefile include/libunwind-common.h
64 include/libunwind.h include/tdep/libunwind_i.h)
65 AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc
66 src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc
67--
681.8.3.1
69
diff --git a/meta/recipes-support/libunwind/libunwind_git.bb b/meta/recipes-support/libunwind/libunwind_git.bb
index 0949a3277c..cc8c2b541c 100644
--- a/meta/recipes-support/libunwind/libunwind_git.bb
+++ b/meta/recipes-support/libunwind/libunwind_git.bb
@@ -9,9 +9,10 @@ SRC_URI = "git://git.sv.gnu.org/libunwind.git \
9 file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ 9 file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \
10 file://0001-x86-Stub-out-x86_local_resume.patch \ 10 file://0001-x86-Stub-out-x86_local_resume.patch \
11 file://0001-Fix-build-on-mips-musl.patch \ 11 file://0001-Fix-build-on-mips-musl.patch \
12" 12 file://0001-add-knobs-to-disable-enable-tests.patch \
13 "
13 14
14EXTRA_OECONF_append_libc-musl = " --disable-documentation" 15EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests "
15 16
16# http://errors.yoctoproject.org/Errors/Details/20487/ 17# http://errors.yoctoproject.org/Errors/Details/20487/
17ARM_INSTRUCTION_SET_armv4 = "arm" 18ARM_INSTRUCTION_SET_armv4 = "arm"