summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-09-22 22:13:03 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-09-22 22:58:54 -0700
commit8d56b2b284d913d13e747196b971c356b5be12e5 (patch)
treef67c8aa1b609914b8056d98bb9ebfd2008e82fbc
parentdev-util/sccache: drop 0.2.12 (diff)
downloadgentoo-8d56b2b284d913d13e747196b971c356b5be12e5.tar.gz
gentoo-8d56b2b284d913d13e747196b971c356b5be12e5.tar.bz2
gentoo-8d56b2b284d913d13e747196b971c356b5be12e5.zip
dev-util/rustup: adjust for cargo_src_configure
Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--dev-util/rustup/rustup-1.22.1-r1.ebuild13
-rw-r--r--dev-util/rustup/rustup-9999.ebuild13
2 files changed, 14 insertions, 12 deletions
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild
index 8f85dafe29d1..9f951ef8aa7d 100644
--- a/dev-util/rustup/rustup-1.22.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild
@@ -274,13 +274,18 @@ src_prepare() {
sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
}
+src_configure() {
+ local myfeatures=( no-self-update )
+ cargo_src_configure
+}
+
src_compile() {
export OPENSSL_NO_VENDOR=true
- cargo_src_compile --features no-self-update
+ cargo_src_compile
}
src_install() {
- cargo_src_install --features no-self-update
+ cargo_src_install
einstalldocs
exeinto /usr/share/rustup
newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
@@ -295,10 +300,6 @@ src_install() {
doins "${T}/_rustup"
}
-src_test() {
- cargo_src_test --features no-self-update
-}
-
pkg_postinst() {
einfo "No rustup toolchains installed by default"
einfo "system rust toolchain can be added to rustup by running"
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
index c3b57a8be11b..5db8a446ae65 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -45,13 +45,18 @@ src_unpack() {
fi
}
+src_configure() {
+ local myfeatures=( no-self-update )
+ cargo_src_configure
+}
+
src_compile() {
export OPENSSL_NO_VENDOR=true
- cargo_src_compile --features no-self-update
+ cargo_src_compile
}
src_install() {
- cargo_src_install --features no-self-update
+ cargo_src_install
einstalldocs
exeinto /usr/share/rustup
newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
@@ -66,10 +71,6 @@ src_install() {
doins "${T}/_rustup"
}
-src_test() {
- cargo_src_test --features no-self-update
-}
-
pkg_postinst() {
einfo "No rustup toolchains installed by default"
einfo "system rust toolchain can be added to rustup by running"