From e96ccb3152f96fd2fa11019fbfec3101c9e2a7a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Mar 2023 13:59:20 +0200 Subject: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. * gnu/packages/rust.scm (rust-1.61)[source]: Adjust snippet to remove workaround for jemalloc library. --- gnu/packages/rust.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 91cd43a9e7..fcb8a77a2e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -617,8 +617,26 @@ safety and thread safety guarantees.") rust-1.59 "1.60.0" "1drqr0a26x1rb2w3kj0i6abhgbs3jx5qqkrcwbwdlx7n3inq5ji0")) (define rust-1.61 - (rust-bootstrapped-package - rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd")) + (let ((base-rust + (rust-bootstrapped-package + rust-1.60 "1.61.0" "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + (delete-file "vendor/vte/vim10m_match") + (delete-file "vendor/vte/vim10m_table") + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) (define rust-1.62 (rust-bootstrapped-package -- cgit v1.2.3