From 75bd9efda3f8b27f2b3b3ca3cb8a2f53f84e7d0e Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 15 Oct 2019 23:08:05 -0700 Subject: [PATCH] media-libs/mesa: Do not depend on llvm if USE=-gallium Closes: https://bugs.gentoo.org/697806 Signed-off-by: Matt Turner --- media-libs/mesa/mesa-9999.ebuild | 62 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index cad8a11cea0e..92046ad35fa2 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -161,51 +161,53 @@ 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? ( + gallium? + llvm? ( + opencl? ( + video_cards_r600? ( ${CLANG_DEPSTR_AMDGPU} ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( + !video_cards_r600? ( + video_cards_radeonsi? ( ${CLANG_DEPSTR_AMDGPU} ) ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( + !video_cards_r600? ( !video_cards_radeonsi? ( - ${CLANG_DEPSTR} + video_cards_radeon? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${CLANG_DEPSTR} + ) ) ) ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( + !opencl? ( + video_cards_r600? ( ${LLVM_DEPSTR_AMDGPU} ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( + !video_cards_r600? ( + video_cards_radeonsi? ( ${LLVM_DEPSTR_AMDGPU} ) ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( + !video_cards_r600? ( !video_cards_radeonsi? ( - ${LLVM_DEPSTR} + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) ) ) ) -- 2.26.2