From: Lucio Sauer <watermanpaint@posteo.net>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH] cargo.eclass: Add cargo_target_dir helper function
Date: Thu, 13 Jun 2024 21:32:50 +0000 [thread overview]
Message-ID: <7afchawnwsvh54fkyedgu727xddihslxk44tjbmtiobr5llmph@rzoy2fteogxc> (raw)
In-Reply-To: <20240613150530.24679-1-chewi@gentoo.org>
[-- Attachment #1: Type: text/plain, Size: 2168 bytes --]
On Thu, Jun 13, 2024 at 04:03:44PM +0100, James Le Cuirot wrote:
> Several Cargo-based ebuilds cannot use cargo_src_install for various
> reasons and manually install binaries from within the target directory
> instead. It is common to see `target/$(usex debug debug release)`, but
> this lacks the target ABI when cross-compiling, so provide a helper
> function.
>
> There are some multilib Cargo-based ebuilds that always set the target
> ABI, even when not cross-compiling. It would be simpler to do this in
> general, so once ebuilds have been updated to use this new helper, I
> might change the eclass again accordingly.
>
> Signed-off-by: James Le Cuirot <chewi@gentoo.org>
> ---
> eclass/cargo.eclass | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
> index 40d98211ce7f9..2036fb635d569 100644
> --- a/eclass/cargo.eclass
> +++ b/eclass/cargo.eclass
> @@ -319,6 +319,16 @@ _cargo_gen_git_config() {
> fi
> }
>
> +# @FUNCTION: cargo_target_dir
> +# @DESCRIPTION:
> +# Return the directory within target that contains the build, e.g.
> +# target/aarch64-unknown-linux-gnu/release.
> +cargo_target_dir() {
> + local abi
> + tc-is-cross-compiler && abi=$(rust_abi)
> + echo "${CARGO_TARGET_DIR:-target}${abi+/}${abi}/$(usex debug debug release)"
> +}
> +
How about giving this function an optional parameter that gets passed to
rust_abi so that you can get the build directory for targets other than
CHOST?
What initially motivated this suggestion is a quirk in app-misc/anki's
build system together with your recent change to cargo.eclass 375da3684,
which enables cross-compilation by setting environment variables.
Here, I first build the 'build system runner' for CBUILD, which then
compiles the actual package for CHOST. I think I can avoid explicitly
setting --target $(rust ${CBUILD}) for the runner for now, but it would
be handy to easily get the build directory for CBUILD in the future!
--
Lucio Sauer
> # @FUNCTION: cargo_src_unpack
> # @DESCRIPTION:
> # Unpacks the package and the cargo registry.
> --
> 2.45.1
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
next prev parent reply other threads:[~2024-06-13 21:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-13 15:03 [gentoo-dev] [PATCH] cargo.eclass: Add cargo_target_dir helper function James Le Cuirot
2024-06-13 21:32 ` Lucio Sauer [this message]
2024-06-14 13:54 ` James Le Cuirot
2024-06-15 20:02 ` Lucio Sauer
2024-06-15 13:59 ` [gentoo-dev] [PATCH v2] " James Le Cuirot
2024-06-15 18:14 ` [gentoo-dev] [PATCH] " Florian Schmaus
2024-06-15 21:56 ` Ionen Wolkens
2024-06-15 22:22 ` 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=7afchawnwsvh54fkyedgu727xddihslxk44tjbmtiobr5llmph@rzoy2fteogxc \
--to=watermanpaint@posteo.net \
--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