guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

309/373: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.


From: guix-commits
Subject: 309/373: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
Date: Sun, 16 Apr 2023 07:11:32 -0400 (EDT)

efraim pushed a commit to branch rust-team
in repository guix.

commit ff1df01ad4ceb10c05ef4462e41b3d6112eee0f1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 14 13:59:20 2023 +0200

    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(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 085123176f..11a76ab3cd 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -623,8 +623,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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]