[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
309/459: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
From: |
guix-commits |
Subject: |
309/459: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. |
Date: |
Mon, 24 Apr 2023 15:03:27 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit d6c8a18f1eed9af16beb9ff127c1bd986e006955
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
- 282/459: gnu: rust-tokio-1: Update to 1.26.0., (continued)
- 282/459: gnu: rust-tokio-1: Update to 1.26.0., guix-commits, 2023/04/24
- 283/459: gnu: rust-adblock: Update to 0.7.5., guix-commits, 2023/04/24
- 284/459: gnu: Remove rust-tokio-1.8., guix-commits, 2023/04/24
- 287/459: gnu: rust-aho-corasick-0.7: Update to 0.7.20., guix-commits, 2023/04/24
- 285/459: gnu: Add rust-mock-instant-0.2., guix-commits, 2023/04/24
- 290/459: gnu: rust-bit-set-0.5: Update to 0.5.3., guix-commits, 2023/04/24
- 291/459: gnu: rust-bytes-1: Update to 1.4.0., guix-commits, 2023/04/24
- 296/459: gnu: rust-ring-0.14: Remove pregenerated files., guix-commits, 2023/04/24
- 294/459: gnu: rust-fixedbitset-0.4: Update to 0.4.2., guix-commits, 2023/04/24
- 297/459: gnu: rust-ring-0.13: Remove pregenerated files., guix-commits, 2023/04/24
- 309/459: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.,
guix-commits <=
- 303/459: gnu: libsequoia: Use existing rust-tokio-1., guix-commits, 2023/04/24
- 305/459: gnu: rust-libmimalloc-sys-0.1: Remove bundled libraries, executables., guix-commits, 2023/04/24
- 306/459: gnu: rust-tikv-jemalloc-sys-0.4: Remove bundled sources., guix-commits, 2023/04/24
- 313/459: gnu: agate: Add missing input., guix-commits, 2023/04/24
- 307/459: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/04/24
- 304/459: gnu: rust-libloading: Remove bundled libraries., guix-commits, 2023/04/24
- 321/459: gnu: Add rust-funty-2., guix-commits, 2023/04/24
- 323/459: gnu: rust-tinyvec-1: Do not skip build., guix-commits, 2023/04/24
- 324/459: gnu: Add rust-pyo3-build-config-0.18., guix-commits, 2023/04/24
- 325/459: gnu: Add rust-pyo3-ffi-0.18., guix-commits, 2023/04/24