From: tranzystorekk <tranzystorekk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] build_helper/rust: automatically use the wrapper script
Date: Thu, 09 Jan 2025 23:31:53 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-53911@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1834 bytes --]
There is a new pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages cargo-autowrap
https://github.com/void-linux/void-packages/pull/53911
build_helper/rust: automatically use the wrapper script
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
This makes various non-cargo-buildstyle places like `uv` use `cargo-auditable` automatically, as long as `build_helper=rust`, `hostmakedepends="cargo cargo-auditable"` and `makedepends="rust-std"` is provided.
The wrapper needs to reset the `CARGO` variable, otherwise cargo falls into an endless loop of recursively calling the script.
Unfortunately, I didn't find a way to make it work with https://github.com/corrosion-rs/corrosion (cmake-rust glue that the new `fish-shell` beta uses, it needs the wrapper passed via `configure_args`)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53911.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cargo-autowrap-53911.patch --]
[-- Type: text/x-diff, Size: 2007 bytes --]
From 93e4eba4cff3f3f1837cdeaa3f490ab1adab424c Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 9 Jan 2025 22:48:33 +0100
Subject: [PATCH 1/2] common/build-helper/rust: make cargo automatically use
the wrapper script
---
common/build-helper/rust.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index c28065f1a67624..bcbcd213fc9218 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -87,9 +87,11 @@ is_auditable() {
}
if ! command -v cargo-auditable >/dev/null || is_auditable "$@"; then
- exec /usr/bin/cargo "$@"
+ CARGO=/usr/bin/cargo exec /usr/bin/cargo "$@"
fi
-exec /usr/bin/cargo auditable "$@"
+CARGO=/usr/bin/cargo exec /usr/bin/cargo auditable "$@"
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/cargo
+
+export CARGO="${XBPS_WRAPPERDIR}/cargo"
From d9ffb6824f4b665690e3f9d940a04faa26447041 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 9 Jan 2025 22:49:42 +0100
Subject: [PATCH 2/2] common/build-style/cargo: use plain cargo as make_cmd
---
common/build-style/cargo.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index db5a3b9c9f6bd5..3f12649a89dfa2 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -3,21 +3,21 @@
#
do_build() {
- : ${make_cmd:=cargo auditable}
+ : ${make_cmd:=cargo}
${make_cmd} build --release --locked --target ${RUST_TARGET} \
${configure_args} ${make_build_args}
}
do_check() {
- : ${make_cmd:=cargo auditable}
+ : ${make_cmd:=cargo}
${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
${configure_args} ${make_check_args}
}
do_install() {
- : ${make_cmd:=cargo auditable}
+ : ${make_cmd:=cargo}
: ${make_install_args:=--path .}
${make_cmd} install --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
reply other threads:[~2025-01-09 22:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-53911@inbox.vuxu.org \
--to=tranzystorekk@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).