diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-02-04 13:47:34 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-02-15 13:47:24 +0100 |
| commit | 5e17597e28426c21f051f449c7855c84a136c469 (patch) | |
| tree | ce2468e8da13fcdcb2cc9b15bf57e620d70941df /media-libs/mesa | |
| parent | dev-util/lldb: Support building against slotted LLVM (diff) | |
| download | gentoo-5e17597e28426c21f051f449c7855c84a136c469.tar.gz gentoo-5e17597e28426c21f051f449c7855c84a136c469.tar.bz2 gentoo-5e17597e28426c21f051f449c7855c84a136c469.zip | |
media-libs/mesa: Update deps for slotted LLVM
Support slotted LLVM versions correctly. Allow any version for 9999,
limit to <5 for 17.0.0_rc2 as current git does not work anymore.
For the older 13.0.4 branch, just force slot :0 since it does not
support 4.0 (the oldest slotted version).
Diffstat (limited to 'media-libs/mesa')
| -rw-r--r-- | media-libs/mesa/mesa-13.0.4.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-17.0.0.ebuild | 26 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 7 |
3 files changed, 28 insertions, 13 deletions
diff --git a/media-libs/mesa/mesa-13.0.4.ebuild b/media-libs/mesa/mesa-13.0.4.ebuild index 9948e240507c..84081c5be9e3 100644 --- a/media-libs/mesa/mesa-13.0.4.ebuild +++ b/media-libs/mesa/mesa-13.0.4.ebuild @@ -99,9 +99,9 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=sys-devel/llvm-3.9.0:0=[${MULTILIB_USEDEP}] ) ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}] ) nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] ) !nettle? ( @@ -151,8 +151,8 @@ DEPEND="${RDEPEND} ) ) ) opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}] + >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}] >=sys-devel/gcc-4.6 ) sys-devel/gettext diff --git a/media-libs/mesa/mesa-17.0.0.ebuild b/media-libs/mesa/mesa-17.0.0.ebuild index 11b03e23a36e..b35f0bc5ef27 100644 --- a/media-libs/mesa/mesa-17.0.0.ebuild +++ b/media-libs/mesa/mesa-17.0.0.ebuild @@ -13,7 +13,7 @@ fi PYTHON_COMPAT=( python2_7 ) -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} +inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} OPENGL_DIR="xorg-x11" @@ -99,9 +99,16 @@ RDEPEND=" llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] - vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( + || ( + sys-devel/llvm:4 + >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) ) ) - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + || ( + sys-devel/llvm:4 + >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}] + ) + <sys-devel/llvm-5:= ) opencl? ( app-eselect/eselect-opencl @@ -143,9 +150,15 @@ DEPEND="${RDEPEND} ) ) ) opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 + || ( + sys-devel/llvm:4 + >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}] + ) + || ( + sys-devel/clang:4 + >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}] + ) + >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig @@ -188,6 +201,7 @@ pkg_setup() { ewarn "detected! This can cause problems. For details, see bug 459306." fi + LLVM_MAX_SLOT=4 llvm_pkg_setup python-any-r1_pkg_setup } diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 11b03e23a36e..fe87f66a7bdf 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -13,7 +13,7 @@ fi PYTHON_COMPAT=( python2_7 ) -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} +inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} OPENGL_DIR="xorg-x11" @@ -143,8 +143,8 @@ DEPEND="${RDEPEND} ) ) ) opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] + >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}] + >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}] >=sys-devel/gcc-4.6 ) sys-devel/gettext @@ -188,6 +188,7 @@ pkg_setup() { ewarn "detected! This can cause problems. For details, see bug 459306." fi + llvm_pkg_setup python-any-r1_pkg_setup } |