[PR PATCH] cargo.sh: don't hardcode the path.

[PR PATCH] cargo.sh: don't hardcode the path.

[travankor]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

There is a new pull request by travankor against master on the void-packages repository

https://github.com/travankor/void-packages rust
https://github.com/void-linux/void-packages/pull/20691

cargo.sh: don't hardcode the path.


A patch file from https://github.com/void-linux/void-packages/pull/20691.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-20691.patch --]
[-- Type: text/x-diff, Size: 854 bytes --]

From 7e6a0621d62194671fe033a4200a93175c5c0773 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 6 Apr 2020 00:38:29 -0700
Subject: [PATCH] cargo.sh: don't hardcode the path.

---
 common/build-style/cargo.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 0257a633929..488382166a3 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -16,8 +16,9 @@ do_check() {
 
 do_install() {
 	: ${make_cmd:=cargo}
+	: ${make_install_args:=--path .}
 
-	${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
+	${make_cmd} install --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
 		--locked ${configure_args} ${make_install_args}
 	rm -f "${DESTDIR}"/usr/.crates.toml
 	rm -f "${DESTDIR}"/usr/.crates2.json

Re: [PR PATCH] [Updated] cargo.sh: don't hardcode the path.

[travankor]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There is an updated pull request by travankor against master on the void-packages repository

https://github.com/travankor/void-packages rust
https://github.com/void-linux/void-packages/pull/20691

cargo.sh: don't hardcode the path.


A patch file from https://github.com/void-linux/void-packages/pull/20691.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-20691.patch --]
[-- Type: text/x-diff, Size: 939 bytes --]

From e9cdbdda402d08169c23b665d3dd4c471f5b8f33 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Mon, 6 Apr 2020 00:38:29 -0700
Subject: [PATCH] cargo.sh: don't hardcode the path.

Clean up the cargo remnants in the post install phase.
---
 common/build-style/cargo.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 0257a633929..3be4791bf71 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -16,9 +16,13 @@ do_check() {
 
 do_install() {
 	: ${make_cmd:=cargo}
+	: ${make_install_args:=--path .}
 
-	${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
+	${make_cmd} install --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
 		--locked ${configure_args} ${make_install_args}
+}
+
+post_install() {
 	rm -f "${DESTDIR}"/usr/.crates.toml
 	rm -f "${DESTDIR}"/usr/.crates2.json
 }

Re: [PR PATCH] [Merged]: cargo.sh: don't hardcode the path.

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

There's a merged pull request on the void-packages repository

cargo.sh: don't hardcode the path.
https://github.com/void-linux/void-packages/pull/20691

Description: