diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2023-05-11 16:04:14 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2023-05-12 13:18:42 -0400 |
| commit | 6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813 (patch) | |
| tree | e48606c20db867c487b395407c55ae8c4d433294 | |
| parent | media-libs/mesa: Fix indentation (diff) | |
| download | gentoo-6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813.tar.gz gentoo-6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813.tar.bz2 gentoo-6c4bdcbd3b25bdc3b4ccd6ab7d839840dbbef813.zip | |
media-libs/mesa: Simplify LLVM dependencies
Specifically, just always require that sys-devel/llvm (or
sys-devel/clang) is built with LLVM_TARGETS=AMDGPU. It's been in
package.use.force since llvm:13 and seems unlikely to be removed. It
also massively simplifies the dependencies.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 68 |
1 files changed, 9 insertions, 59 deletions
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 636061a77169..e5976cb09708 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -107,69 +107,25 @@ RDEPEND="${RDEPEND} # 2. Update the := to specify *max* version, e.g. < 10. # 3. Specify LLVM_MAX_SLOT, e.g. 9. LLVM_MAX_SLOT="16" +LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}" LLVM_DEPSTR=" || ( - sys-devel/llvm:16[${MULTILIB_USEDEP}] - sys-devel/llvm:15[${MULTILIB_USEDEP}] + sys-devel/@@@@:16[${LLVM_USE_DEPS}] + sys-devel/@@@@:15[${LLVM_USE_DEPS}] ) - <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] + <sys-devel/@@@@-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] " -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} RDEPEND="${RDEPEND} llvm? ( opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) + ${LLVM_DEPSTR//@@@@/clang} ) !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) + ${LLVM_DEPSTR//@@@@/llvm} ) ) " -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} +unset LLVM_DEPSTR DEPEND="${RDEPEND} video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] ) @@ -204,16 +160,10 @@ x86? ( )" llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1 fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" } pkg_pretend() { |