2 files changed, 84 insertions, 0 deletions
diff --git a/packages/dev-libs/libunwind/files/0001-tests-Use-correctly-prefixed-nm-binary.patch b/packages/dev-libs/libunwind/files/0001-tests-Use-correctly-prefixed-nm-binary.patch
new file mode 100644
index 0000000..1f61c0e
--- /dev/null
+++ b/packages/dev-libs/libunwind/files/0001-tests-Use-correctly-prefixed-nm-binary.patch
@@ -0,0 +1,45 @@
+From 488db3f013e3d50c104760df8fa0771a2f679d9c Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Sun, 25 Sep 2016 20:00:02 +0200
+Subject: [PATCH 1/2] tests: Use correctly prefixed nm binary
+
+---
+ configure.ac                | 4 ++++
+ tests/check-namespace.sh.in | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cffe19b..61f6cfc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,6 +21,10 @@ LT_INIT
+ AM_PROG_AS
+ AM_PROG_CC_C_O
+ 
++dnl for namespace test
++AC_PROG_GREP
++AC_PROG_NM
++
+ dnl Checks for libraries.
+ AC_CHECK_LIB(uca, __uc_get_grs)
+ OLD_LIBS=${LIBS}
+diff --git a/tests/check-namespace.sh.in b/tests/check-namespace.sh.in
+index d2e6efb..56a63f1 100644
+--- a/tests/check-namespace.sh.in
++++ b/tests/check-namespace.sh.in
+@@ -28,10 +28,10 @@ fetch_symtab () {
+     # Unfortunately, "nm --defined" is a GNU-extension.  For portability,
+     # build the list of defined symbols by hand.
+     #
+-    symtab=`nm -g $filename`
++    symtab=`$NM -g $filename`
+     saved_IFS="$IFS"
+     IFS=""
+-    undef=`nm -g -u $filename`
++    undef=`$NM -g -u $filename`
+     for line in $undef; do
+ 	symtab=`echo "$symtab" | grep -v "^${line}"\$`
+     done;
+-- 
+2.10.0
+
diff --git a/packages/dev-libs/libunwind/files/0002-tests-Remove-coredump-tests.patch b/packages/dev-libs/libunwind/files/0002-tests-Remove-coredump-tests.patch
new file mode 100644
index 0000000..38afde2
--- /dev/null
+++ b/packages/dev-libs/libunwind/files/0002-tests-Remove-coredump-tests.patch
@@ -0,0 +1,39 @@
+From 8815239fc4e9cc8bc60a2703a622c0f5280f36c2 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Mon, 26 Sep 2016 08:11:21 +0200
+Subject: [PATCH 2/2] tests: Remove coredump tests
+Upstream: No, not a suitable solution. Improvement of tests is/was discussed at https://lists.nongnu.org/archive/html/libunwind-devel/2016-02/
+msg00019.html
+
+The coredump tests rely on the assumption that coredump files
+are created in the current working directory. This assumption is
+false when e.g. systemd-coredump is used.
+---
+ tests/Makefile.am | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7287e7b..796df0c 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -66,17 +66,6 @@ if SUPPORT_CXX_EXCEPTIONS
+  check_PROGRAMS_cdep += Ltest-cxx-exceptions
+ endif
+ 
+-if OS_LINUX
+-if BUILD_COREDUMP
+- check_SCRIPTS_cdep += run-coredump-unwind
+- noinst_PROGRAMS_cdep += crasher test-coredump-unwind
+-
+-if HAVE_LZMA
+- check_SCRIPTS_cdep += run-coredump-unwind-mdi
+-endif # HAVE_LZMA
+-endif # BUILD_COREDUMP
+-endif # OS_LINUX
+-
+ perf: perf-startup Gperf-simple Lperf-simple Lperf-trace
+ 	@echo "########## Basic performance of generic libunwind:"
+ 	@./Gperf-simple
+-- 
+2.13.1
+