| 1 |
commit: 1e7008e09bee9cbb9c4f99397210dc0b0cf0ce62 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 12:22:20 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 13:28:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7008e0 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Pass libunwind include & (fake) src path, #596340 |
| 9 |
|
| 10 |
sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild | 7 ++++++- |
| 11 |
sys-libs/libcxxabi/libcxxabi-9999.ebuild | 8 +++++++- |
| 12 |
2 files changed, 13 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild |
| 15 |
index 4684548..a74a53d 100644 |
| 16 |
--- a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild |
| 17 |
+++ b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild |
| 18 |
@@ -24,7 +24,7 @@ RDEPEND=" |
| 19 |
libunwind? ( |
| 20 |
|| ( |
| 21 |
>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 22 |
- sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] |
| 23 |
+ >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 24 |
) |
| 25 |
)" |
| 26 |
DEPEND="${RDEPEND} |
| 27 |
@@ -66,6 +66,11 @@ multilib_src_configure() { |
| 28 |
-DLLVM_INCLUDE_TESTS=$(usex test) |
| 29 |
|
| 30 |
-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/include |
| 31 |
+ # upstream is omitting standard search path for this |
| 32 |
+ # probably because gcc & clang are bundling their own unwind.h |
| 33 |
+ -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 34 |
+ # this only needs to exist, it does not have to make sense |
| 35 |
+ -DLIBCXXABI_LIBUNWIND_SOURCES="${T}" |
| 36 |
) |
| 37 |
if use test; then |
| 38 |
mycmakeargs+=( |
| 39 |
|
| 40 |
diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild |
| 41 |
index 66de8aa..e84bfd7 100644 |
| 42 |
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild |
| 43 |
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild |
| 44 |
@@ -25,7 +25,7 @@ RDEPEND=" |
| 45 |
libunwind? ( |
| 46 |
|| ( |
| 47 |
>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 48 |
- sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] |
| 49 |
+ >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 50 |
) |
| 51 |
)" |
| 52 |
DEPEND="${RDEPEND} |
| 53 |
@@ -69,6 +69,12 @@ multilib_src_configure() { |
| 54 |
-DLLVM_INCLUDE_TESTS=$(usex test) |
| 55 |
|
| 56 |
-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 57 |
+ # upstream is omitting standard search path for this |
| 58 |
+ # probably because gcc & clang are bundling their own unwind.h |
| 59 |
+ -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 60 |
+ # this only needs to exist, it does not have to make sense |
| 61 |
+ # FIXME: remove this once https://reviews.llvm.org/D25314 is merged |
| 62 |
+ -DLIBCXXABI_LIBUNWIND_SOURCES="${T}" |
| 63 |
) |
| 64 |
if use test; then |
| 65 |
mycmakeargs+=( |
Archives