From 93e4eba4cff3f3f1837cdeaa3f490ab1adab424c Mon Sep 17 00:00:00 2001 From: tranzystorekk 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 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" \