diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
| commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
| tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-lang/rust | |
| parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) | |
gentoo resync : 05.04.2019
Diffstat (limited to 'dev-lang/rust')
| -rw-r--r-- | dev-lang/rust/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.33.0.ebuild | 41 |
2 files changed, 30 insertions, 13 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index b3ffd6639645..22fbd7c838b9 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -80,5 +80,5 @@ EBUILD rust-1.29.2-r1.ebuild 7534 BLAKE2B 43c508d7642a46035317595c7fa937316cca0f EBUILD rust-1.30.1-r1.ebuild 8207 BLAKE2B d78ee4c3a6ae06b9ba343721dff150348ce86ef060bcabbc3d523d6acf89c0c9ad6b2a8713c1376515060a285ade75286b4f2c9c67e09e0d56a3f5f8be17b49b SHA512 1ef857ee44e8d6fc55dfc546d6636c4368ed74300b901b01a1bf22291fc3562b9262231e567b9d4df80407c721548f2f2cc2fb6222d8598b4169618cfc7f18c7 EBUILD rust-1.31.1.ebuild 8205 BLAKE2B 349c6817d25ac006b66e10702cb11f061afdaad818f9dad7e708ef941e8e01a906e496fe52153d48c25428bb7b45c777589dbdd5c969b628e401086d86aabd49 SHA512 7c648f97105d9be1bc7eaa3904bf4af923eaf3dd8bc4da62a8662eb761d06e7a6a389aefa71fe13b56fa61560763897541a677fca9b4cfc698fe0a4b1c422828 EBUILD rust-1.32.0.ebuild 8672 BLAKE2B 64c5bc60a4b2acb5c10e51990cfd31b30868bb0a68e5bb6b457d1ec9e278c4f49e82eeb34ef936f8ae27124061e989ef93a47fa5b5c09d9de2fd0e70f58391f2 SHA512 e07f819613b47d9ccebb0890e512f9510c58775602a362152cf8a78074d0a994dc710454f9a35956c7a6bf023655746f3bf9da879e7f00a5bb232cdc1e78b03e -EBUILD rust-1.33.0.ebuild 8364 BLAKE2B 0ff30623b9d8a9fc69920594655c459a3a2fa41475d6d4e7c570b70ea366017533033b81a50ad31fc6fd989510fa31dc0e9c23b89649a3d0cb4226824f97a3cc SHA512 c1facefcaa840848011975795754a0705344adbd480d46add4da28c84aa9eb3f0627caef4e92480bba3fe583315ca59082ba800dc3dbd2b1e7325f4e0f0596eb +EBUILD rust-1.33.0.ebuild 8754 BLAKE2B 420025a98acb698403e55308a9e3340c535ce1a7459143b4611311b69c7057b8568746d1a5c2822434db01c1e51da01170b54ea177afe3d9d5eb3ca9958eceba SHA512 db6840cb69852a569912aff53427b3062d3f4807f80b30dcc4181cbca28765854ca4ac070dfa77744e38c636a49e9f12a98b1f0337b71be7368f757042238f71 MISC metadata.xml 634 BLAKE2B 394e75b1b5b5d9fad1d87dca27d7807bfce9eb723bc339dbb7c0630dc5abd3669e9469a9e75da74925d16d63c78971b0e7c84710db9b2cd15e87d81f49968903 SHA512 9e02acc0ad17e2f502c6082b5df9aeb6b9655783892a85d67855b3f6a79ec36dca610170bb002116c354626d44282c4e35e30cdf6b5e49745cfc6a990f55731c diff --git a/dev-lang/rust/rust-1.33.0.ebuild b/dev-lang/rust/rust-1.33.0.ebuild index aff9229221d0..0cc4462509e3 100644 --- a/dev-lang/rust/rust-1.33.0.ebuild +++ b/dev-lang/rust/rust-1.33.0.ebuild @@ -5,8 +5,6 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) -LLVM_MAX_SLOT=8 - inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs if [[ ${PV} = *beta* ]]; then @@ -40,13 +38,34 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" -COMMON_DEPEND="sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-libs/http-parser:= - net-misc/curl[ssl] - system-llvm? ( >=sys-devel/llvm-7:= )" +# 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. < 8. +# 3. Specify LLVM_MAX_SLOT, e.g. 7. +LLVM_DEPEND=" + || ( + sys-devel/llvm:7 + ) + <sys-devel/llvm-8:= +" +LLVM_MAX_SLOT=7 + +COMMON_DEPEND=" + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-libs/http-parser:= + net-misc/curl[ssl] + system-llvm? ( + ${LLVM_DEPEND} + ) +" + DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} || ( @@ -91,9 +110,7 @@ pkg_pretend() { pkg_setup() { pre_build_checks python-any-r1_pkg_setup - if use system-llvm; then - llvm_pkg_setup - fi + use system-llvm && llvm_pkg_setup } src_prepare() { |