From 5eaf4f7d2bd17b50782a7c36ccffed80092970f0 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 24 Apr 2018 13:44:45 -0400 Subject: [PATCH 1/2] dev-libs/rustlib: Add a versioned subslot --- .../coreos-overlay/dev-libs/rustlib/rustlib-1.25.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.25.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.25.0.ebuild index 82a7d6e6ff..d5484a07b8 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.25.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.25.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017 CoreOS, Inc. +# Copyright 2017-2018 CoreOS, Inc. # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ S="${WORKDIR}/rustc-${PV}-src" RDEPEND="!dev-lang/rust" -SLOT="0" +SLOT="0/${PVR}" KEYWORDS="amd64 arm64" src_configure() { From 8399fd5274028aecf362e852c4a677c1e9e4c887 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 24 Apr 2018 13:44:55 -0400 Subject: [PATCH 2/2] eclass/coreos-cargo: Rebuild Rust projects when Rust is updated Trigger rebuilds when the cross-compiled libraries' slot value changes, which uses a subset defined to the package version. --- .../src/third_party/coreos-overlay/eclass/coreos-cargo.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass index dc8fe32a54..e7fd90627e 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass @@ -1,4 +1,4 @@ -# Copyright 2017 CoreOS, Inc. +# Copyright 2017-2018 CoreOS, Inc. # Distributed under the terms of the GNU General Public License v2 # @ECLASS: coreos-cargo.eclass @@ -18,7 +18,7 @@ inherit toolchain-funcs EXPORT_FUNCTIONS src_unpack [[ ${CATEGORY}/${PN} != dev-libs/rustlib ]] && DEPEND="|| ( - dev-libs/rustlib + dev-libs/rustlib:= dev-util/cargo )"