commit: 9684c6f55dac92d5d17946563c861f87b6ce576b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 09:26:57 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 09:36:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9684c6f5
sys-devel/clang-common: Depend on compiler-rt via clang-runtime
Depend on sys-devel/clang-runtime[compiler-rt] rather than
on sys-libs/compiler-rt directly. Since compiler-rt is slotted while
sys-devel/clang-common is not, it is impossible to guarantee that
a compiler-rt version matching all installed sys-devel/clang versions
will be installed. While depending on clang-runtime does not strictly
solve this either, enforcing a USE dependency has a good chance
of having the user enable USE=compiler-rt on all versions
of clang-runtime, and then clang-runtime dep in sys-devel/clang will
enforce the correct compiler-rt version.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-devel/clang-common/clang-common-15.0.2.9999.ebuild | 2 +-
sys-devel/clang-common/clang-common-15.0.2.ebuild | 2 +-
sys-devel/clang-common/clang-common-16.0.0.9999.ebuild | 2 +-
sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
index 617e3159ca14..e318815568c5 100644
--- a/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.2.9999.ebuild
@@ -16,7 +16,7 @@ IUSE="default-compiler-rt default-libcxx default-lld
llvm-libunwind"
PDEPEND="
sys-devel/clang:*
default-compiler-rt? (
- =sys-libs/compiler-rt-${LLVM_VERSION}*
+ sys-devel/clang-runtime[compiler-rt]
llvm-libunwind? ( sys-libs/llvm-libunwind )
!llvm-libunwind? ( sys-libs/libunwind )
)
diff --git a/sys-devel/clang-common/clang-common-15.0.2.ebuild
b/sys-devel/clang-common/clang-common-15.0.2.ebuild
index a8fa6ec6070f..71e8aa15b6d8 100644
--- a/sys-devel/clang-common/clang-common-15.0.2.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.2.ebuild
@@ -16,7 +16,7 @@ IUSE="default-compiler-rt default-libcxx default-lld
llvm-libunwind"
PDEPEND="
sys-devel/clang:*
default-compiler-rt? (
- =sys-libs/compiler-rt-${PV%_*}*
+ sys-devel/clang-runtime[compiler-rt]
llvm-libunwind? ( sys-libs/llvm-libunwind )
!llvm-libunwind? ( sys-libs/libunwind )
)
diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
index 617e3159ca14..e318815568c5 100644
--- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild
@@ -16,7 +16,7 @@ IUSE="default-compiler-rt default-libcxx default-lld
llvm-libunwind"
PDEPEND="
sys-devel/clang:*
default-compiler-rt? (
- =sys-libs/compiler-rt-${LLVM_VERSION}*
+ sys-devel/clang-runtime[compiler-rt]
llvm-libunwind? ( sys-libs/llvm-libunwind )
!llvm-libunwind? ( sys-libs/libunwind )
)
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
b/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
index 617e3159ca14..e318815568c5 100644
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
+++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221006.ebuild
@@ -16,7 +16,7 @@ IUSE="default-compiler-rt default-libcxx default-lld
llvm-libunwind"
PDEPEND="
sys-devel/clang:*
default-compiler-rt? (
- =sys-libs/compiler-rt-${LLVM_VERSION}*
+ sys-devel/clang-runtime[compiler-rt]
llvm-libunwind? ( sys-libs/llvm-libunwind )
!llvm-libunwind? ( sys-libs/libunwind )
)
