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

diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
index 46845482e4651e3745cdb7c21caf4f2137744d88..a74a53d98e9f134b35ebbac8c9777c14d3b4b2fc 100644 (file)
--- 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 66de8aaa299bde2f32b80fb4d57bb50212c145c6..e84bfd70f8493a8e4854fa4aaf5376f732397289 100644 (file)
--- 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+=(