From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/
Date: Mon, 2 Oct 2017 17:04:08 +0000 (UTC) [thread overview]
Message-ID: <1506963802.4b13a94f842380c506f42c47fac0fd77dfa6ac2c.lluixhi@gentoo> (raw)
commit: 4b13a94f842380c506f42c47fac0fd77dfa6ac2c
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Oct 2 17:03:22 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Oct 2 17:03:22 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=4b13a94f
media-libs/mesa: version bump to 17.1.10/17.2.2
media-libs/mesa/Manifest | 6 +-
.../{mesa-17.2.1.ebuild => mesa-17.1.10.ebuild} | 23 +++--
media-libs/mesa/mesa-17.2.1.ebuild | 103 ++++++++++++++++++---
.../{mesa-17.2.1.ebuild => mesa-17.2.2.ebuild} | 103 ++++++++++++++++++---
4 files changed, 194 insertions(+), 41 deletions(-)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 0e2f63a..0c92f6d 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -6,15 +6,19 @@ AUX mesa-17-missing-fcntl_h.patch 385 SHA256 61fa64c296d22c0a490576ec595ee1a4beb
DIST mesa-13.0.5.tar.xz 9171480 SHA256 bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1 WHIRLPOOL 164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e
DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441 WHIRLPOOL 1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
DIST mesa-17.0.6.tar.xz 9494872 SHA256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf WHIRLPOOL f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab
+DIST mesa-17.1.10.tar.xz 9872168 SHA256 cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b WHIRLPOOL d33cc0b7620e01822ce6ca2708f01eccc6c7796c1ed19f3642dab733521d17d794658dbc47bcca7d71f94f99c81637a28738dc6c45c4d1ccc7e2855f07a5f961
DIST mesa-17.1.8.tar.xz 9902800 SHA256 75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db SHA512 d29fd999d75967683f5aa836cf0b701705f54de428ebbbac059c3e335e94552c0b455aa67fa2870464a086dc58994f2f320710a1abc265dea363241aede71c5b WHIRLPOOL 8faad2f3da8546d48ee9b5470d147de7507a0dc39787a876f6513933e958baa94571d285095fced7c34c674364ab897a896acc39374849fb22026dd05a9bd27f
DIST mesa-17.1.9.tar.xz 9908296 SHA256 5f51ad94341696097d5df7b838183534478216858ac0fc8de183671a36ffea1a SHA512 359da171deaba0a1a5ce7112d49d7b48be38d24d0211264fcdcc3218f1f35be9419e5be1d08d56b6ca15654d3f93107b1706ff18a5e31d3746f7a3191b808cdf WHIRLPOOL a4b76204005ed15cee799a0e7e590d5e9f5078f65d83fccec26f00ab397c4144f70ff6eac652f13197af3bbdf4c4096c531329766297caa9875aee47bc3e4d67
DIST mesa-17.2.0.tar.xz 10335284 SHA256 3123448f770eae58bc73e15480e78909defb892f10ab777e9116c9b218094943 SHA512 6ac39274fcf86a26ea5fe51aed486ba3d45b75e0d2f7cc17e1e71d4cf9a85420a832fe559a2ac7b215eda615fab99a2bd290c8388a48c52e13737e7e4ef8d4fd WHIRLPOOL 3fec3810c23aa12f49c0fe561b6dbdbd5724a3bff513b21c273d5796c85eebdd889fb405a03f7cc0fe926a8289794e1872a0d04799c31122061a268faceacf36
DIST mesa-17.2.1.tar.xz 10414776 SHA256 77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e SHA512 19a7d6c2e2d439b1c73199bffd4154b42017bccc138be954a893c3b70e885f07988de84dc8aa2aff36e06295e91f0181d5b95372152f6f0f80b7afe4b3846b6a WHIRLPOOL b9048aa4d512307c3f558a925afb39949ea84b7e52ca52e2ba39cf6fba38c284ef527b25fdbfa7ec22ca6c9e17a8628ce41fc8916bfaafc7f5142c3476750b6d
+DIST mesa-17.2.2.tar.xz 10359156 SHA256 cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 SHA512 641342c68989b8d801c37e668b012d3b7c4ad43d8ca01b74f8cbb3a1ec25b7390f69fe7ebc84b29dab1c6a4ac01c882ec9fd4a6b331505629461bdbbe6aa3f7e WHIRLPOOL 74271721fb38a0c62f6f35d84ba9196e000f2fe2a32e75120288e77649a87e225464572d347fc149190b573d22c32dfee3e174d6a2578b3c649c4b72375a94ec
EBUILD mesa-13.0.5.ebuild 13700 SHA256 976acd2588bdad196db14ea94d7908257aae3b4a3647e0b67c2a98991ce505c1 SHA512 5b7118bf47b32a108907674754a96ba6660561ee5f2e02e9b65cd55fbfc9e9af6b09d1e63d7cb6a1366b6ca048bf6bb64c04d357cb24eed05e171e6a1fc5a1dd WHIRLPOOL 6e709af9862d4e71de9eaf8736c0515c98713424dd8e4a9842b3ef24311edd3f0344c6b1c377c42f2213019c0251ba13410c4ed1c11ca6ad94708caa6d663580
EBUILD mesa-13.0.6.ebuild 13626 SHA256 8c52b73f947625e30b63ebf09f7ef24ca1253924369ba16f462ee51ddae1f710 SHA512 ef98945307ca3a6e157a0e68f333dd06eda8b6ff053d8663f99bc17e352f5db10aebc4f8cb514b68e4abf06a97f278740b4d2aa97b2e2bc8d3a5fce43ece37f2 WHIRLPOOL 5292e8d17f5e1d09a44a8260b1e2f99af87dc0348c61efd64a54b2b88edb0dda14813d7aec53c37133e16de1b339ec7c45c6c7f2edc9c655f062361812aa565a
EBUILD mesa-17.0.6.ebuild 13633 SHA256 1b72648e1c77ecae4bbd639a4bc93f25be477b764ce4fdff0a5867334e22bea1 SHA512 2a8ab4f22d6dbba9fadee3e566931104fff23e58ee3ed9a358dbe4a946acdca067c753a865c471342cef6d9a564efd688e3d46f2c8df5f138ee40409436cb434 WHIRLPOOL e156696276d32c8359d002baa620cf54bd8827bfe427f45212541e875d39d3b544d7a011d37d02fff5f4d855f20275e3fec1e9a481f5ed07cb27296b454cba9b
+EBUILD mesa-17.1.10.ebuild 13510 SHA256 68948c65aa47611e9df044b15049e2c762c2178c037fc491fa88839eddeaa4d7 SHA512 5c305a289d36883517e48402f63a4a8883c80fba6c67936c4b13c1a394220df05a2d30be23a536127ab31302c8ac40b78c36bd1faf6f8464a6dd300a6bf2096d WHIRLPOOL b84db37e1807e1b9e95c7437486dbd46f4b3ee4f406388887f30b715da23f0b27e5fd846a2261a00556b961a705389a43d3cd0fc5e96833d2dc003611a0c5cf2
EBUILD mesa-17.1.8.ebuild 13507 SHA256 0c238bc97f47ab8449a851702ccd0ff2660d62995e260a5caf43be58662ea2c1 SHA512 4ee9f6a463599b9f89bdb1d4c35a27a46efe3d96fcf3cc534fc6030bae538f5c7ebd4c67d905c7adc6081a789555e90f79169bf6f1358f18b5afe4ad79a7106a WHIRLPOOL 755a3b62729b891d28dae4e3f2fa648bebd58a3526dfcd66a66c5322cdacc338edbcb1b6baf1994f7b60b2f7eb07b7032d8aa25d44d2609437e312ac01456c02
EBUILD mesa-17.1.9.ebuild 13510 SHA256 68948c65aa47611e9df044b15049e2c762c2178c037fc491fa88839eddeaa4d7 SHA512 5c305a289d36883517e48402f63a4a8883c80fba6c67936c4b13c1a394220df05a2d30be23a536127ab31302c8ac40b78c36bd1faf6f8464a6dd300a6bf2096d WHIRLPOOL b84db37e1807e1b9e95c7437486dbd46f4b3ee4f406388887f30b715da23f0b27e5fd846a2261a00556b961a705389a43d3cd0fc5e96833d2dc003611a0c5cf2
EBUILD mesa-17.2.0.ebuild 13540 SHA256 6425956f1c9353f8c69abe199b0c44d514453be6f6c73457c6109fa50109c2bf SHA512 d9551cbbf3f05b847d8f4311948172778f1602077d809424a845f310852e821ff44c62d8e6273a1f1b622ec0e859d5581ad72bc8791544308d072faea374ff59 WHIRLPOOL 3fc1ede8283d7a8b32f544c282143bbd5844a3bc4041a8d878fccbbb43bca292be255cf75fd9cf3df52cd8e54dd6f6dd3d08113566d1d572d3bf18854ad81846
-EBUILD mesa-17.2.1.ebuild 13540 SHA256 6425956f1c9353f8c69abe199b0c44d514453be6f6c73457c6109fa50109c2bf SHA512 d9551cbbf3f05b847d8f4311948172778f1602077d809424a845f310852e821ff44c62d8e6273a1f1b622ec0e859d5581ad72bc8791544308d072faea374ff59 WHIRLPOOL 3fc1ede8283d7a8b32f544c282143bbd5844a3bc4041a8d878fccbbb43bca292be255cf75fd9cf3df52cd8e54dd6f6dd3d08113566d1d572d3bf18854ad81846
+EBUILD mesa-17.2.1.ebuild 14997 SHA256 59ee3e1c8413ea9508ec31ec20b5e017d27cdf78d0c0ffcc21507137defd93e3 SHA512 f9cf8c28a2316ab9e8cfc6efb597a51b17767c83c4fa73b0e76cc90fccc47321c42a475e9c2b0ad5caec1565b1b196541142a2cb5064e8ddbb3d00093efb7006 WHIRLPOOL 05153ed20702f1a2b96d1200d0145e886037d5cb0d694912e86151e594156ce25d25d59d39395745de8d4a26b13ce414e9834c08ebbecac913fc605a4be6b5fe
+EBUILD mesa-17.2.2.ebuild 14997 SHA256 59ee3e1c8413ea9508ec31ec20b5e017d27cdf78d0c0ffcc21507137defd93e3 SHA512 f9cf8c28a2316ab9e8cfc6efb597a51b17767c83c4fa73b0e76cc90fccc47321c42a475e9c2b0ad5caec1565b1b196541142a2cb5064e8ddbb3d00093efb7006 WHIRLPOOL 05153ed20702f1a2b96d1200d0145e886037d5cb0d694912e86151e594156ce25d25d59d39395745de8d4a26b13ce414e9834c08ebbecac913fc605a4be6b5fe
MISC metadata.xml 2536 SHA256 d19b63eae85e1a25553e11db8b6e38b31f55810412d7e48680bd78fda4fe4808 SHA512 1cd7e6d44125ee93792e403205fa07b434867764f31135e26997518e5b848ffdc57af6b3591c541531bab45c9bb629b88638001a03c314347c708f743899e666 WHIRLPOOL 561a884f9ea3bc15d070e52e53cf3ea461a94ee33f0b06778595c83ab9e35311367dbe37a681201d19cb0c9610fe7eebfb295e1cf116c2b040d286ee579676ac
diff --git a/media-libs/mesa/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild
similarity index 96%
copy from media-libs/mesa/mesa-17.2.1.ebuild
copy to media-libs/mesa/mesa-17.1.10.ebuild
index 84b26ef..89c42db 100644
--- a/media-libs/mesa/mesa-17.2.1.ebuild
+++ b/media-libs/mesa/mesa-17.1.10.ebuild
@@ -32,8 +32,9 @@ LICENSE="MIT"
SLOT="0"
RESTRICT="!bindist? ( bindist )"
+INTEL_CARDS="i915 i965 intel"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 vivante vmware"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
@@ -74,7 +75,7 @@ REQUIRED_USE="
video_cards_vmware? ( gallium )
"
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
RDEPEND="
@@ -118,18 +119,16 @@ RDEPEND="
video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
)
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
+ wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
- video_cards_intel? (
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- )
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
"
+for card in ${INTEL_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ "
+done
+
for card in ${RADEON_CARDS}; do
RDEPEND="${RDEPEND}
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
@@ -237,7 +236,7 @@ multilib_src_configure() {
fi
if use egl; then
- myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+ myconf+=" --with-egl-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
fi
if use gallium; then
diff --git a/media-libs/mesa/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.2.1.ebuild
index 84b26ef..789541f 100644
--- a/media-libs/mesa/mesa-17.2.1.ebuild
+++ b/media-libs/mesa/mesa-17.2.1.ebuild
@@ -97,7 +97,6 @@ RDEPEND="
llvm? (
video_cards_radeonsi? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
)
video_cards_r600? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
@@ -105,7 +104,6 @@ RDEPEND="
video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
@@ -139,20 +137,84 @@ RDEPEND="${RDEPEND}
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
"
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="5"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+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? (
- video_cards_radeonsi? ( || (
- sys-devel/llvm[llvm_targets_AMDGPU]
- sys-devel/llvm[video_cards_radeon]
- ) )
+ 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}
+ )
+ )
+ )
+ )
+ !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}
+ )
+ )
+ )
+ )
)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
opencl? (
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
+ >=sys-devel/gcc-4.6
)
sys-devel/gettext
virtual/pkgconfig
@@ -187,6 +249,19 @@ 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[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm[${flags}]"
+}
+
pkg_setup() {
# warning message for bug 459306
if use llvm && has_version sys-devel/llvm[!debug=]; then
@@ -194,7 +269,7 @@ pkg_setup() {
ewarn "detected! This can cause problems. For details, see bug 459306."
fi
- if use llvm || use opencl; then
+ if use llvm; then
llvm_pkg_setup
fi
python-any-r1_pkg_setup
diff --git a/media-libs/mesa/mesa-17.2.1.ebuild b/media-libs/mesa/mesa-17.2.2.ebuild
similarity index 87%
copy from media-libs/mesa/mesa-17.2.1.ebuild
copy to media-libs/mesa/mesa-17.2.2.ebuild
index 84b26ef..789541f 100644
--- a/media-libs/mesa/mesa-17.2.1.ebuild
+++ b/media-libs/mesa/mesa-17.2.2.ebuild
@@ -97,7 +97,6 @@ RDEPEND="
llvm? (
video_cards_radeonsi? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
- vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
)
video_cards_r600? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
@@ -105,7 +104,6 @@ RDEPEND="
video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
@@ -139,20 +137,84 @@ RDEPEND="${RDEPEND}
video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
"
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="5"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+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? (
- video_cards_radeonsi? ( || (
- sys-devel/llvm[llvm_targets_AMDGPU]
- sys-devel/llvm[video_cards_radeon]
- ) )
+ 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}
+ )
+ )
+ )
+ )
+ !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}
+ )
+ )
+ )
+ )
)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
opencl? (
- >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
+ >=sys-devel/gcc-4.6
)
sys-devel/gettext
virtual/pkgconfig
@@ -187,6 +249,19 @@ 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[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm[${flags}]"
+}
+
pkg_setup() {
# warning message for bug 459306
if use llvm && has_version sys-devel/llvm[!debug=]; then
@@ -194,7 +269,7 @@ pkg_setup() {
ewarn "detected! This can cause problems. For details, see bug 459306."
fi
- if use llvm || use opencl; then
+ if use llvm; then
llvm_pkg_setup
fi
python-any-r1_pkg_setup
next reply other threads:[~2017-10-02 17:04 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 17:04 Aric Belsito [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-10 19:52 [gentoo-commits] proj/musl:master commit in: media-libs/mesa/ Jory Pratt
2022-02-09 1:14 Jory Pratt
2022-01-05 22:38 Jory Pratt
2021-12-19 14:11 Jory Pratt
2021-11-25 14:49 Jory Pratt
2021-08-16 18:27 Jory Pratt
2021-07-06 13:17 Jory Pratt
2021-04-01 13:03 Jory Pratt
2021-03-10 3:14 Jory Pratt
2021-02-01 19:54 Jory Pratt
2020-12-07 13:39 Jory Pratt
2020-12-03 16:34 Jory Pratt
2020-11-08 0:02 Jory Pratt
2020-09-28 22:56 Jory Pratt
2020-06-14 23:35 Jory Pratt
2020-04-04 3:02 Jory Pratt
2020-04-02 13:46 Jory Pratt
2020-03-21 3:09 Jory Pratt
2020-03-17 14:32 Jory Pratt
2020-03-07 17:37 Jory Pratt
2020-02-21 1:02 Jory Pratt
2020-02-14 14:02 Jory Pratt
2020-01-29 15:16 Jory Pratt
2020-01-12 0:23 Jory Pratt
2020-01-08 3:12 Jory Pratt
2019-12-21 21:50 Jory Pratt
2019-12-20 19:01 Jory Pratt
2019-12-14 21:32 Jory Pratt
2019-12-05 16:52 Jory Pratt
2019-11-29 17:09 Jory Pratt
2019-11-23 0:20 Jory Pratt
2019-11-13 22:40 Jory Pratt
2019-10-10 14:39 Jory Pratt
2019-09-26 2:53 Jory Pratt
2019-09-23 5:08 Jory Pratt
2019-09-13 12:37 Jory Pratt
2019-09-13 3:43 Jory Pratt
2019-09-09 14:13 Jory Pratt
2019-08-23 21:50 Jory Pratt
2019-08-22 3:05 Jory Pratt
2019-08-11 21:22 Jory Pratt
2019-07-25 0:34 Jory Pratt
2019-07-09 20:24 Jory Pratt
2019-06-29 7:49 Jory Pratt
2019-06-26 4:52 Jory Pratt
2019-06-11 21:13 Jory Pratt
2019-06-06 1:22 Jory Pratt
2019-05-30 5:55 Jory Pratt
2019-05-22 23:45 Jory Pratt
2019-05-20 21:04 Jory Pratt
2019-05-08 5:13 Jory Pratt
2019-05-08 3:26 Jory Pratt
2019-04-25 4:09 Jory Pratt
2019-04-17 1:24 Anthony G. Basile
2019-04-17 1:13 Anthony G. Basile
2019-04-11 16:55 Jory Pratt
2019-04-05 16:03 Jory Pratt
2019-03-27 21:34 Jory Pratt
2018-12-03 5:08 Anthony G. Basile
2018-10-31 12:26 Anthony G. Basile
2018-10-04 21:25 Anthony G. Basile
2018-10-04 21:21 Anthony G. Basile
2018-08-22 1:25 Anthony G. Basile
2018-08-19 17:46 Anthony G. Basile
2018-08-19 17:41 Anthony G. Basile
2018-08-19 17:20 Anthony G. Basile
2018-07-04 23:31 Jory Pratt
2018-06-05 4:43 Aric Belsito
2018-06-02 1:18 Aric Belsito
2018-05-21 16:23 Aric Belsito
2018-05-15 20:17 Jory Pratt
2018-05-08 18:01 Jory Pratt
2018-05-07 19:21 Aric Belsito
2018-04-29 17:19 Aric Belsito
2018-04-22 17:46 Anthony G. Basile
2018-04-21 19:42 Aric Belsito
2018-04-21 19:26 Aric Belsito
2018-04-12 16:34 Aric Belsito
2018-03-28 16:07 Aric Belsito
2018-03-28 15:59 Aric Belsito
2018-03-22 3:24 Aric Belsito
2018-03-04 17:23 Anthony G. Basile
2018-03-04 16:57 Anthony G. Basile
2018-02-09 4:34 Aric Belsito
2018-01-29 19:54 Aric Belsito
2018-01-25 20:03 Aric Belsito
2018-01-24 21:14 Aric Belsito
2018-01-24 21:11 Aric Belsito
2018-01-22 23:15 Jory Pratt
2017-12-31 16:52 Anthony G. Basile
2017-12-29 21:42 Aric Belsito
2017-11-24 18:56 Aric Belsito
2017-11-22 4:57 Aric Belsito
2017-11-14 21:29 Aric Belsito
2017-11-08 3:25 Aric Belsito
2017-10-31 17:04 Aric Belsito
2017-10-20 4:23 Aric Belsito
2017-09-18 1:00 Aric Belsito
2017-09-05 18:48 Aric Belsito
2017-09-05 13:39 Anthony G. Basile
2017-08-31 20:10 Jory Pratt
2017-08-22 15:24 Aric Belsito
2017-08-13 17:33 Jory Pratt
2017-08-08 20:09 Aric Belsito
2017-07-15 1:01 Aric Belsito
2017-06-30 20:45 Aric Belsito
2017-06-21 16:37 Aric Belsito
2017-06-21 16:18 Aric Belsito
2017-06-11 1:26 Aric Belsito
2017-05-30 20:06 Aric Belsito
2017-05-16 0:36 Aric Belsito
2017-05-08 20:55 Aric Belsito
2017-04-30 2:14 Aric Belsito
2017-04-17 16:12 Aric Belsito
2017-04-03 1:52 Aric Belsito
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1506963802.4b13a94f842380c506f42c47fac0fd77dfa6ac2c.lluixhi@gentoo \
--to=lluixhi@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox