1 |
commit: d55b86576b619fe136ae363749da5b9a873fe48a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 6 13:15:17 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 6 13:29:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55b8657 |
7 |
|
8 |
sys-libs/libcxxabi: Fix running tests against ext libunwind |
9 |
|
10 |
.../files/libcxxabi-3.9.0-test-unwind.patch | 37 ++++++++++++++++++++++ |
11 |
sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild | 2 ++ |
12 |
2 files changed, 39 insertions(+) |
13 |
|
14 |
diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch |
15 |
new file mode 100644 |
16 |
index 00000000..1005cb7 |
17 |
--- /dev/null |
18 |
+++ b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch |
19 |
@@ -0,0 +1,37 @@ |
20 |
+From fff85c801ae564a09479e1e8e4cf81977536c550 Mon Sep 17 00:00:00 2001 |
21 |
+From: Petr Hosek <phosek@××××××××.org> |
22 |
+Date: Mon, 8 Aug 2016 22:09:54 +0000 |
23 |
+Subject: [PATCH] Do not depend on unwind when building standalone |
24 |
+ |
25 |
+When libcxxabi is being built standalone, unwind dependency is not |
26 |
+available, so do not use it even when LLVM unwinder is being |
27 |
+requested. |
28 |
+ |
29 |
+Differential Revision: https://reviews.llvm.org/D23228 |
30 |
+ |
31 |
+git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@278058 91177308-0d34-0410-b5e6-96231b3b80d8 |
32 |
+--- |
33 |
+ test/CMakeLists.txt | 7 +++---- |
34 |
+ 1 file changed, 3 insertions(+), 4 deletions(-) |
35 |
+ |
36 |
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt |
37 |
+index 31b5d1d..3a489bf 100644 |
38 |
+--- a/test/CMakeLists.txt |
39 |
++++ b/test/CMakeLists.txt |
40 |
+@@ -36,10 +36,9 @@ endif() |
41 |
+ |
42 |
+ if (NOT LIBCXXABI_BUILT_STANDALONE) |
43 |
+ list(APPEND LIBCXXABI_TEST_DEPS cxx) |
44 |
+-endif() |
45 |
+- |
46 |
+-if (LIBCXXABI_USE_LLVM_UNWINDER) |
47 |
+- list(APPEND LIBCXXABI_TEST_DEPS unwind) |
48 |
++ if (LIBCXXABI_USE_LLVM_UNWINDER) |
49 |
++ list(APPEND LIBCXXABI_TEST_DEPS unwind) |
50 |
++ endif() |
51 |
+ endif() |
52 |
+ |
53 |
+ add_lit_testsuite(check-libcxxabi "Running libcxxabi tests" |
54 |
+-- |
55 |
+2.10.1 |
56 |
+ |
57 |
|
58 |
diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild |
59 |
index a74a53d..48c4519 100644 |
60 |
--- a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild |
61 |
+++ b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild |
62 |
@@ -48,6 +48,8 @@ src_prepare() { |
63 |
|
64 |
# backport cmake path fix for llvm-3.9+ |
65 |
eapply "${FILESDIR}/${P}-cmake-path.patch" |
66 |
+ # kill stray unwind test dep in stand-alone builds |
67 |
+ eapply "${FILESDIR}/${P}-test-unwind.patch" |
68 |
} |
69 |
|
70 |
src_configure() { |