[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
298/469: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
From: |
guix-commits |
Subject: |
298/469: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. |
Date: |
Tue, 25 Apr 2023 15:03:48 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 8628d74851e7e2a4f8d30ce42b863eeef8617885
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 a1dc343492..f22674cd77 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -615,8 +615,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
- 357/469: gnu: Add rust-bitflags-2., (continued)
- 357/469: gnu: Add rust-bitflags-2., guix-commits, 2023/04/25
- 358/469: gnu: rust-curl-sys-0.4: Update to 0.4.61+curl-8.0.1., guix-commits, 2023/04/25
- 362/469: gnu: newsboat: Update to 2.31., guix-commits, 2023/04/25
- 378/469: gnu: Add rust-objc-sys-0.3., guix-commits, 2023/04/25
- 381/469: gnu: Add rust-objc2-encode-2., guix-commits, 2023/04/25
- 386/469: gnu: rust-wayland-cursor-0.29: Update to 0.29.5., guix-commits, 2023/04/25
- 387/469: gnu: rust-wayland-egl-0.29: Update to 0.29.5., guix-commits, 2023/04/25
- 158/469: gnu: Remove rust-try-lock-0.1., guix-commits, 2023/04/25
- 297/469: gnu: rust-1.55: Remove bundled libraries., guix-commits, 2023/04/25
- 296/469: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/04/25
- 298/469: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.,
guix-commits <=
- 318/469: gnu: Add rust-ahash-0.8., guix-commits, 2023/04/25
- 315/469: gnu: Add rust-markup-proc-macro-0.13., guix-commits, 2023/04/25
- 317/469: gnu: Add rust-radium-0.7., guix-commits, 2023/04/25
- 327/469: gnu: rust-windows-x86-64-gnu-0.42: Update to 0.42.2., guix-commits, 2023/04/25
- 328/469: gnu: Add rust-windows-targets-0.42., guix-commits, 2023/04/25
- 333/469: gnu: Add rust-bitvec-1., guix-commits, 2023/04/25
- 330/469: gnu: rust-arbitrary-1: Update to 1.3.0., guix-commits, 2023/04/25
- 320/469: gnu: rust-uuid-macro-internal-1: Update to 1.3.0., guix-commits, 2023/04/25
- 338/469: gnu: rust-proc-macro2-1: Update to 1.0.52., guix-commits, 2023/04/25
- 355/469: gnu: rust: Disable tests that fail on aarch64., guix-commits, 2023/04/25