[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/

[Michał Górny]

commit:     1e7008e09bee9cbb9c4f99397210dc0b0cf0ce62
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 12:22:20 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 13:28:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7008e0

sys-libs/libcxxabi: Pass libunwind include & (fake) src path, #596340

 sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild | 7 ++++++-
 sys-libs/libcxxabi/libcxxabi-9999.ebuild  | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild 
b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
index 4684548..a74a53d 100644
--- a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
        libunwind? (
                || (
                        
>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-                       sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}]
+                       
>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
                )
        )"
 DEPEND="${RDEPEND}
@@ -66,6 +66,11 @@ multilib_src_configure() {
                -DLLVM_INCLUDE_TESTS=$(usex test)
 
                
-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/include
+               # upstream is omitting standard search path for this
+               # probably because gcc & clang are bundling their own unwind.h
+               -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+               # this only needs to exist, it does not have to make sense
+               -DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
        )
        if use test; then
                mycmakeargs+=(

diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
index 66de8aa..e84bfd7 100644
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
        libunwind? (
                || (
                        
>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-                       sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}]
+                       
>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
                )
        )"
 DEPEND="${RDEPEND}
@@ -69,6 +69,12 @@ multilib_src_configure() {
                -DLLVM_INCLUDE_TESTS=$(usex test)
 
                -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+               # upstream is omitting standard search path for this
+               # probably because gcc & clang are bundling their own unwind.h
+               -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+               # this only needs to exist, it does not have to make sense
+               # FIXME: remove this once https://reviews.llvm.org/D25314 is 
merged
+               -DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
        )
        if use test; then
                mycmakeargs+=(