[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
457/470: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
From: |
guix-commits |
Subject: |
457/470: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. |
Date: |
Thu, 16 Mar 2023 03:02:40 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 3211d3c73e7b90e47826b62cbbb1ab372c02da92
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
- 424/470: gnu: Add rust-nu-ansi-term-0.46., (continued)
- 424/470: gnu: Add rust-nu-ansi-term-0.46., guix-commits, 2023/03/16
- 379/470: gnu: Remove rust-lexical-5., guix-commits, 2023/03/16
- 396/470: gnu: gtk+-2: Remove trailing #t from phases., guix-commits, 2023/03/16
- 402/470: gnu: gtk+-2: Skip two more tests., guix-commits, 2023/03/16
- 412/470: gnu: Add rust-jemallocator-0.5., guix-commits, 2023/03/16
- 415/470: gnu: rust-nix-0.26: Update to 0.26.2., guix-commits, 2023/03/16
- 442/470: gnu: rust-fixedbitset-0.4: Update to 0.4.2., guix-commits, 2023/03/16
- 444/470: gnu: rust-ring-0.14: Remove pregenerated files., guix-commits, 2023/03/16
- 450/470: gnu: Add rust-aes-ctr-0.6., guix-commits, 2023/03/16
- 456/470: gnu: rust-1.55: Remove bundled libraries., guix-commits, 2023/03/16
- 457/470: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.,
guix-commits <=
- 467/470: gnu: sniffglue: Add missing input., guix-commits, 2023/03/16
- 180/470: gnu: Add rust-hkdf-0.12., guix-commits, 2023/03/16
- 422/470: gnu: Add rust-test-case-macros-2., guix-commits, 2023/03/16
- 375/470: gnu: rav1e: Update to 0.6.3., guix-commits, 2023/03/16
- 371/470: gnu: rust-wasm-bindgen-test-0.3: Update to 0.3.34., guix-commits, 2023/03/16
- 409/470: gnu: rust-ctrlc-3: Update to 3.2.5., guix-commits, 2023/03/16
- 394/470: gnu: Add rust-exr-1., guix-commits, 2023/03/16
- 428/470: gnu: rust-signal-hook-0.3: Update to 0.3.15., guix-commits, 2023/03/16
- 416/470: gnu: Add rust-ron-0.7., guix-commits, 2023/03/16
- 411/470: gnu: Add rust-jemalloc-sys-0.5., guix-commits, 2023/03/16