[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/17: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
From: |
guix-commits |
Subject: |
06/17: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. |
Date: |
Wed, 15 Mar 2023 06:55:01 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit f6e821e1fcd9e01268b6d94c51abf30de6493991
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
- branch rust-team updated (ff5f84d019 -> 59a7c3f1c9), guix-commits, 2023/03/15
- 01/17: gnu: rust-libloading: Remove bundled libraries., guix-commits, 2023/03/15
- 02/17: gnu: rust-libmimalloc-sys-0.1: Remove bundled libraries, executables., guix-commits, 2023/03/15
- 04/17: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/03/15
- 05/17: gnu: rust-1.55: Remove bundled libraries., guix-commits, 2023/03/15
- 03/17: gnu: rust-tikv-jemalloc-sys-0.4: Remove bundled sources., guix-commits, 2023/03/15
- 06/17: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.,
guix-commits <=
- 11/17: gnu: rust-pyo3-macros-0.15: Update to 0.15.2., guix-commits, 2023/03/15
- 10/17: gnu: rust-pyo3-macros-backend-0.15: Update to 0.15.2., guix-commits, 2023/03/15
- 09/17: gnu: rust-pyo3-build-config-0.15: Update to 0.15.2., guix-commits, 2023/03/15
- 17/17: gnu: rbw: Add missing input., guix-commits, 2023/03/15
- 13/17: gnu: rust-adblock-0.7: Add missing input., guix-commits, 2023/03/15
- 12/17: gnu: rust-pyo3-0.15: Update to 0.15.2., guix-commits, 2023/03/15
- 07/17: gnu: rust: Remove more bundled sources., guix-commits, 2023/03/15
- 08/17: gnu: Add rust-indexmap-1.6., guix-commits, 2023/03/15
- 14/17: gnu: agate: Add missing input., guix-commits, 2023/03/15
- 16/17: gnu: sniffglue: Add missing input., guix-commits, 2023/03/15