From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH] cargo.eclass: add CARGO_TOML_DIR
Date: Tue, 23 Jan 2024 04:48:02 +0100 [thread overview]
Message-ID: <d16e9a9c1667339218cb452c02c8f0ae3ace7323.camel@gentoo.org> (raw)
In-Reply-To: <20240122193222.7d9a5b0e@Akita>
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
On Mon, 2024-01-22 at 19:32 -0800, orbea wrote:
> This is required when cargo_live_src_unpack needs to be find a
> Cargo.toml file in a directory other than ${S}
>
> Signed-off-by: orbea <orbea@riseup.net>
> ---
> eclass/cargo.eclass | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
> index 3bdbb5e3ec64..692623382c56 100644
> --- a/eclass/cargo.eclass
> +++ b/eclass/cargo.eclass
> @@ -116,6 +116,15 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
> # other src_functions of this eclass.
> # Note that cargo_gen_config is automatically called by cargo_src_unpack.
>
> +# @ECLASS_VARIABLE: CARGO_TOML_DIR
> +# @DEFAULT_UNSET
> +# @DESCRIPTION:
> +# Optional variable containing the directory path to the Cargo.toml file.
> +# Should be defined before calling cargo_live_src_unpack.
> +#
> +# This is required for live ebuilds when Cargo.toml in a directory other
> +# than ${S}.
> +
> # @ECLASS_VARIABLE: myfeatures
> # @DEFAULT_UNSET
> # @DESCRIPTION:
> @@ -403,7 +412,7 @@ cargo_live_src_unpack() {
> umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
> fi
>
> - pushd "${S}" > /dev/null || die
> + pushd "${CARGO_TOML_DIR:-$S}" > /dev/null || die
Please respect the current variable style.
>
> # Respect user settings before cargo_gen_config is called.
> if [[ ! ${CARGO_TERM_COLOR} ]]; then
--
Best regards,
Michał Górny
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]
next prev parent reply other threads:[~2024-01-23 3:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 16:14 [gentoo-dev] [PATCH] profiles: workaround sandbox bug with getcwd() configure test (gl_cv_func_getcwd_path_max) Sam James
2024-01-22 16:35 ` David Seifert
2024-01-22 16:45 ` [gentoo-dev] " Arsen Arsenović
2024-01-23 3:32 ` [gentoo-dev] [PATCH] cargo.eclass: add CARGO_TOML_DIR orbea
2024-01-23 3:48 ` Michał Górny [this message]
2024-01-23 14:13 ` orbea
2024-01-23 16:48 ` Michał Górny
2024-01-23 19:43 ` orbea
2024-01-24 18:59 ` orbea
2024-01-23 4:06 ` Eli Schwartz
2024-01-23 14:11 ` orbea
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=d16e9a9c1667339218cb452c02c8f0ae3ace7323.camel@gentoo.org \
--to=mgorny@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