Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
Date: Wed, 15 Feb 2017 21:08:42
Message-Id: 1487192914.8887e178a3f5bbd7a8959a4bbd6a0282cb698659.mgorny@gentoo
1 commit: 8887e178a3f5bbd7a8959a4bbd6a0282cb698659
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 15 21:06:54 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 15 21:08:34 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8887e178
7
8 media-libs/mesa: Fix uncond call to llvm_pkg_setup, #608536
9
10 media-libs/mesa/mesa-17.0.0.ebuild | 4 +++-
11 media-libs/mesa/mesa-9999.ebuild | 4 +++-
12 2 files changed, 6 insertions(+), 2 deletions(-)
13
14 diff --git a/media-libs/mesa/mesa-17.0.0.ebuild b/media-libs/mesa/mesa-17.0.0.ebuild
15 index b35f0bc5ef..d6d58afc0d 100644
16 --- a/media-libs/mesa/mesa-17.0.0.ebuild
17 +++ b/media-libs/mesa/mesa-17.0.0.ebuild
18 @@ -201,7 +201,9 @@ pkg_setup() {
19 ewarn "detected! This can cause problems. For details, see bug 459306."
20 fi
21
22 - LLVM_MAX_SLOT=4 llvm_pkg_setup
23 + if use llvm || use opencl; then
24 + LLVM_MAX_SLOT=4 llvm_pkg_setup
25 + fi
26 python-any-r1_pkg_setup
27 }
28
29
30 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
31 index fe87f66a7b..2f05b05d30 100644
32 --- a/media-libs/mesa/mesa-9999.ebuild
33 +++ b/media-libs/mesa/mesa-9999.ebuild
34 @@ -188,7 +188,9 @@ pkg_setup() {
35 ewarn "detected! This can cause problems. For details, see bug 459306."
36 fi
37
38 - llvm_pkg_setup
39 + if use llvm || use opencl; then
40 + llvm_pkg_setup
41 + fi
42 python-any-r1_pkg_setup
43 }