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

[Michał Górny]

commit:     5fa9f8aaffeef3b0fb2cb75bde0b49dd9f355d63
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  9 16:10:23 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar  9 16:14:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa9f8aa

sys-libs/llvm-libunwind: Correct test dependencies

 sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild    | 5 ++++-
 sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild | 5 ++++-
 sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild     | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
index 45ca2b2e5f9..db6bc3cacf8 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild
@@ -25,10 +25,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
+# tests need libcxx with implicit -lunwind and libcxxabi
+# (but libcxx does not need to be built against it)
 DEPEND="
        >=sys-devel/llvm-6
        test? (
-               sys-libs/libcxx[${MULTILIB_USEDEP}]
+               sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}]
+               sys-libs/libcxxabi
                $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
index 789d9a6d71c..6eb95d733fc 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild
@@ -24,10 +24,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
+# tests need libcxx with implicit -lunwind and libcxxabi
+# (but libcxx does not need to be built against it)
 DEPEND="
        >=sys-devel/llvm-6
        test? (
-               sys-libs/libcxx[${MULTILIB_USEDEP}]
+               sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}]
+               sys-libs/libcxxabi
                $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 # least intrusive of all

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
index c16358fe4c6..387b8c31086 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
@@ -23,10 +23,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
 # llvm-6 for new lit options
+# tests need libcxx with implicit -lunwind and libcxxabi
+# (but libcxx does not need to be built against it)
 DEPEND="
        >=sys-devel/llvm-6
        test? (
-               sys-libs/libcxx[${MULTILIB_USEDEP}]
+               sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}]
+               sys-libs/libcxxabi
                $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
 
 # least intrusive of all