summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-09-17 12:13:34 +0200
committerMichał Górny <mgorny@gentoo.org>2017-09-28 15:15:33 +0200
commit8c6b43c7f4bd4a7de57bfbe4e3af433281565b1f (patch)
tree2e83cb3273fabc84f1ef8a5977f5e9bbdf6d4532 /media-libs
parentmedia-libs/mesa: Use helper var in LLVM deps for flexibility (diff)
downloadgentoo-8c6b43c7f4bd4a7de57bfbe4e3af433281565b1f.tar.gz
gentoo-8c6b43c7f4bd4a7de57bfbe4e3af433281565b1f.tar.bz2
gentoo-8c6b43c7f4bd4a7de57bfbe4e3af433281565b1f.zip
media-libs/mesa: Use correct slotted LLVM deps
Introduce a proper complete slotted dependency block for LLVM. While it's not strictly necessary whenever the Mesa version supports the newest LLVM version, keeping it unconditionally will help developers wrap up Mesa releases correctly.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/mesa-9999.ebuild15
1 files changed, 14 insertions, 1 deletions
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6cc00b907127..cd6ff53c78ac 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -140,7 +140,20 @@ RDEPEND="${RDEPEND}
# Please keep the LLVM dependency block separate. Since LLVM is slotted,
# we need to *really* make sure we're not pulling one than more slot
# simultaneously.
-LLVM_DEPSTR=">=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}]"
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:6[${MULTILIB_USEDEP}]
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}