From e7c4d9353ac81b0c791bbb7bfefb2fdbb2a14b2e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 28 Apr 2020 17:09:44 +0200 Subject: [PATCH 1/2] eclass: make cargo depend on virtual/rust instead of virtual/cargo Since `virtual/cargo` does not exist in the recent Rust ebuilds, dependency on the missing package `virtual/cargo` caused build issues in the SDK. So we should make it depend on `virtual/rust` to fix the build issues. --- .../src/third_party/portage-stable/eclass/cargo.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass index 5d272c7700..68e1cfd4c8 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass @@ -13,7 +13,7 @@ if [[ -z ${_CARGO_ECLASS} ]]; then _CARGO_ECLASS=1 CARGO_DEPEND="" -[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/cargo" +[[ ${CATEGORY}/${PN} != dev-util/cargo ]] && CARGO_DEPEND="virtual/rust" case ${EAPI} in 6) DEPEND="${CARGO_DEPEND}";; From d87f113ebbdc70e4d01c906dbafb8cc3f8c5f60f Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 28 Apr 2020 17:13:03 +0200 Subject: [PATCH 2/2] virtual/rust: set version back to 1.36.0 We updated `virtual/rust` to 1.41.1, but have not done so for `dev-lang/rust`, which remains as 1.36.0. Such a mismatch prevents the whole build to fail. For now, let's revert `virtual/rust` back to 1.36.0. --- .../virtual/rust/{rust-1.41.1.ebuild => rust-1.36.0.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sdk_container/src/third_party/portage-stable/virtual/rust/{rust-1.41.1.ebuild => rust-1.36.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.41.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.36.0.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.41.1.ebuild rename to sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.36.0.ebuild