public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: orbea <orbea@riseup.net>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] [PATCH] cargo.eclass: add CARGO_TOML_DIR
Date: Mon, 22 Jan 2024 19:32:22 -0800	[thread overview]
Message-ID: <20240122193222.7d9a5b0e@Akita> (raw)
In-Reply-To: <20240122161434.991554-1-sam@gentoo.org>

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
 
 	# Respect user settings before cargo_gen_config is called.
 	if [[ ! ${CARGO_TERM_COLOR} ]]; then
-- 
2.41.0



  parent reply	other threads:[~2024-01-23  3:32 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 ` orbea [this message]
2024-01-23  3:48   ` [gentoo-dev] [PATCH] cargo.eclass: add CARGO_TOML_DIR Michał Górny
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=20240122193222.7d9a5b0e@Akita \
    --to=orbea@riseup.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