[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     4fb9b0b2c5ff6d1acd219019c22165feb9ee73c9
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 17:14:23 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Nov 28 17:14:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4fb9b0b2

media-libs/mesa: make llvm-shared-libs optional

This allows users to work around incomplete RPATH in i915g until a proper fix is implemented.
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=488216

---
 media-libs/mesa/mesa-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dc18ff1..e00c65b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,15 +49,16 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa kernel_FreeBSD"
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler
+	selinux vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	opencl? (
 		gallium
+		llvm-shared-libs
 		video_cards_r600? ( r600-llvm-compiler )
 		video_cards_radeon? ( r600-llvm-compiler )
 		video_cards_radeonsi? ( r600-llvm-compiler )
@@ -293,9 +294,9 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
+		$(use_with llvm-shared-libs) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
 		PYTHON2="${PYTHON}" \
 		${myconf}
 }