[packages/rust] - honour rpm _libexecdir setting
qboosh
qboosh at pld-linux.org
Sat Aug 28 19:27:10 CEST 2021
commit 4b354bd7f41a953be29bdeb0d8f715a59fcbf655
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Aug 28 19:31:21 2021 +0200
- honour rpm _libexecdir setting
rust.spec | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/rust.spec b/rust.spec
index a2ff943..c68e23d 100644
--- a/rust.spec
+++ b/rust.spec
@@ -367,6 +367,15 @@ sed -e '/*\//q' library/backtrace/crates/backtrace-sys/src/libbacktrace/backtrac
sed -i -e 's#DIRECTORY=".*"#DIRECTORY="%{_datadir}/%{name}/etc"#' \
src/etc/rust-gdb
+# cargo has hardcoded libexec path - honour rpm _libexecdir
+%if "%{_libexecdir}" != "%{_prefix}/libexec"
+suffix="%(echo "%{_libexecdir}" | %{__sed} -e 's,^%{_prefix}/,,')"
+%{__sed} -i -e 's,"libexec","'${suffix}'",' \
+ src/bootstrap/dist.rs \
+ src/tools/cargo/src/cargo/ops/registry/auth.rs
+%{__sed} -i -e 's,libexec/,'${suffix}'/,' src/tools/cargo/tests/testsuite/credential_process.rs
+%endif
+
# The configure macro will modify some autoconf-related files, which upsets
# cargo when it tries to verify checksums in those files. If we just truncate
# that file list, cargo won't have anything to complain about.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/4b354bd7f41a953be29bdeb0d8f715a59fcbf655
More information about the pld-cvs-commit
mailing list