| 1 |
commit: 67fb3694a54ab1c8a19fdf16d5b0421aa982e0e0 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 19 00:33:51 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 19 01:23:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67fb3694 |
| 7 |
|
| 8 |
dev-lang/rust: doesn't support >=sys-devel/llvm-8 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/rust/rust-1.30.1-r1.ebuild | 6 ++++-- |
| 14 |
dev-lang/rust/rust-1.31.1.ebuild | 6 ++++-- |
| 15 |
dev-lang/rust/rust-1.32.0.ebuild | 6 ++++-- |
| 16 |
3 files changed, 12 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/rust/rust-1.30.1-r1.ebuild b/dev-lang/rust/rust-1.30.1-r1.ebuild |
| 19 |
index f0ff75335fa..7aee61f2377 100644 |
| 20 |
--- a/dev-lang/rust/rust-1.30.1-r1.ebuild |
| 21 |
+++ b/dev-lang/rust/rust-1.30.1-r1.ebuild |
| 22 |
@@ -1,10 +1,12 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
|
| 29 |
PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) |
| 30 |
|
| 31 |
+LLVM_MAX_SLOT=7 |
| 32 |
+ |
| 33 |
inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs |
| 34 |
|
| 35 |
if [[ ${PV} = *beta* ]]; then |
| 36 |
@@ -182,7 +184,7 @@ src_configure() { |
| 37 |
EOF |
| 38 |
if use system-llvm; then |
| 39 |
cat <<- EOF >> "${S}"/config.toml |
| 40 |
- llvm-config = "$(get_llvm_prefix)/bin/llvm-config" |
| 41 |
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" |
| 42 |
EOF |
| 43 |
fi |
| 44 |
done |
| 45 |
|
| 46 |
diff --git a/dev-lang/rust/rust-1.31.1.ebuild b/dev-lang/rust/rust-1.31.1.ebuild |
| 47 |
index 22ed3b4a4c0..debbd8a7a98 100644 |
| 48 |
--- a/dev-lang/rust/rust-1.31.1.ebuild |
| 49 |
+++ b/dev-lang/rust/rust-1.31.1.ebuild |
| 50 |
@@ -1,10 +1,12 @@ |
| 51 |
-# Copyright 1999-2018 Gentoo Authors |
| 52 |
+# Copyright 1999-2019 Gentoo Authors |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
|
| 55 |
EAPI=6 |
| 56 |
|
| 57 |
PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) |
| 58 |
|
| 59 |
+LLVM_MAX_SLOT=7 |
| 60 |
+ |
| 61 |
inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs |
| 62 |
|
| 63 |
if [[ ${PV} = *beta* ]]; then |
| 64 |
@@ -182,7 +184,7 @@ src_configure() { |
| 65 |
EOF |
| 66 |
if use system-llvm; then |
| 67 |
cat <<- EOF >> "${S}"/config.toml |
| 68 |
- llvm-config = "$(get_llvm_prefix)/bin/llvm-config" |
| 69 |
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" |
| 70 |
EOF |
| 71 |
fi |
| 72 |
done |
| 73 |
|
| 74 |
diff --git a/dev-lang/rust/rust-1.32.0.ebuild b/dev-lang/rust/rust-1.32.0.ebuild |
| 75 |
index bc2a6106b8a..18425b87101 100644 |
| 76 |
--- a/dev-lang/rust/rust-1.32.0.ebuild |
| 77 |
+++ b/dev-lang/rust/rust-1.32.0.ebuild |
| 78 |
@@ -5,6 +5,8 @@ EAPI=6 |
| 79 |
|
| 80 |
PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) |
| 81 |
|
| 82 |
+LLVM_MAX_SLOT=7 |
| 83 |
+ |
| 84 |
inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs |
| 85 |
|
| 86 |
if [[ ${PV} = *beta* ]]; then |
| 87 |
@@ -45,7 +47,7 @@ COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 |
| 88 |
net-libs/libssh2 |
| 89 |
net-libs/http-parser:= |
| 90 |
net-misc/curl[ssl] |
| 91 |
- system-llvm? ( >=sys-devel/llvm-7:= )" |
| 92 |
+ system-llvm? ( sys-devel/llvm:7= )" |
| 93 |
DEPEND="${COMMON_DEPEND} |
| 94 |
${PYTHON_DEPS} |
| 95 |
|| ( |
| 96 |
@@ -184,7 +186,7 @@ src_configure() { |
| 97 |
EOF |
| 98 |
if use system-llvm; then |
| 99 |
cat <<- EOF >> "${S}"/config.toml |
| 100 |
- llvm-config = "$(get_llvm_prefix)/bin/llvm-config" |
| 101 |
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" |
| 102 |
EOF |
| 103 |
fi |
| 104 |
done |
Archives