* [PR PATCH] build-style/cargo: use env var to select sparse index mode
@ 2023-04-02 10:29 tranzystorek-io
2023-04-02 20:16 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: tranzystorek-io @ 2023-04-02 10:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
There is a new pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages cargo-index-env
https://github.com/void-linux/void-packages/pull/43187
build-style/cargo: use env var to select sparse index mode
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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/43187.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cargo-index-env-43187.patch --]
[-- Type: text/x-diff, Size: 1921 bytes --]
From a05531fe002d9188c14e62dde3c2e66a3c86b979 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 2 Apr 2023 12:28:59 +0200
Subject: [PATCH] build-style/cargo: use env var to select sparse index mode
---
common/build-style/cargo.sh | 6 +++---
common/environment/build-style/cargo.sh | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 9f30a1e5c2d5..387e711060bc 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,13 @@
do_build() {
: ${make_cmd:=cargo auditable}
- ${make_cmd} --config 'registries.crates-io.protocol="sparse"' build --release --target ${RUST_TARGET} ${configure_args}
+ ${make_cmd} build --release --target ${RUST_TARGET} ${configure_args}
}
do_check() {
: ${make_cmd:=cargo auditable}
- ${make_check_pre} ${make_cmd} --config 'registries.crates-io.protocol="sparse"' test --release --target ${RUST_TARGET} ${configure_args} \
+ ${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
${make_check_args}
}
@@ -19,7 +19,7 @@ do_install() {
: ${make_cmd:=cargo auditable}
: ${make_install_args:=--path .}
- ${make_cmd} --config 'registries.crates-io.protocol="sparse"' install --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
+ ${make_cmd} install --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
--offline --locked ${configure_args} ${make_install_args}
rm -f "${DESTDIR}"/usr/.crates.toml
diff --git a/common/environment/build-style/cargo.sh b/common/environment/build-style/cargo.sh
index 473750c7a359..bc836b06cf06 100644
--- a/common/environment/build-style/cargo.sh
+++ b/common/environment/build-style/cargo.sh
@@ -8,4 +8,6 @@ if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
fi
+export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+
build_helper+=" rust"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: build-style/cargo: use env var to select sparse index mode
2023-04-02 10:29 [PR PATCH] build-style/cargo: use env var to select sparse index mode tranzystorek-io
@ 2023-04-02 20:16 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2023-04-02 20:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]
There's a merged pull request on the void-packages repository
build-style/cargo: use env var to select sparse index mode
https://github.com/void-linux/void-packages/pull/43187
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-02 20:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-02 10:29 [PR PATCH] build-style/cargo: use env var to select sparse index mode tranzystorek-io
2023-04-02 20:16 ` [PR PATCH] [Merged]: " classabbyamp
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).