From: James Le Cuirot <chewi@gentoo.org>
To: gentoo-dev <gentoo-dev@lists.gentoo.org>
Cc: James Le Cuirot <chewi@gentoo.org>
Subject: [gentoo-dev] [PATCH v2 1/2] cargo.eclass: Drop EAPI 7 support
Date: Tue, 11 Jun 2024 14:41:55 +0100 [thread overview]
Message-ID: <20240611134436.10245-1-chewi@gentoo.org> (raw)
It is going to inherit rust-toolchain, which is EAPI 8 only.
Closes: https://bugs.gentoo.org/715890
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
eclass/cargo.eclass | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index a685cd99fb38b..72c740cda9065 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -7,11 +7,11 @@
# @AUTHOR:
# Doug Goldstein <cardoe@gentoo.org>
# Georgy Yakovlev <gyakovlev@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
# @BLURB: common functions and variables for cargo builds
case ${EAPI} in
- 7|8) ;;
+ 8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -23,10 +23,6 @@ _CARGO_ECLASS=1
RUST_DEPEND="virtual/rust"
case ${EAPI} in
- 7)
- # 1.37 added 'cargo vendor' subcommand and net.offline config knob
- RUST_DEPEND=">=virtual/rust-1.37.0"
- ;;
8)
# 1.39 added --workspace
# 1.46 added --target dir
@@ -556,17 +552,6 @@ cargo_src_install() {
rm -f "${ED}/usr/.crates.toml" || die
rm -f "${ED}/usr/.crates2.json" || die
-
- # it turned out to be non-standard dir, so get rid of it future EAPI
- # and only run for EAPI=7
- # https://bugs.gentoo.org/715890
- case ${EAPI:-0} in
- 7)
- if [ -d "${S}/man" ]; then
- doman "${S}/man" || return 0
- fi
- ;;
- esac
}
# @FUNCTION: cargo_src_test
--
2.45.1
next reply other threads:[~2024-06-11 13:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-11 13:41 James Le Cuirot [this message]
2024-06-11 13:41 ` [gentoo-dev] [PATCH v2 2/2] cargo.eclass: Enable cross-compiling by setting environment variables James Le Cuirot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240611134436.10245-1-chewi@gentoo.org \
--to=chewi@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox