[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
298/471: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
From: |
guix-commits |
Subject: |
298/471: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. |
Date: |
Wed, 3 May 2023 09:28:33 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit daff7ea68f37035cfd0df84ac3e56073c220c501
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 91cd43a9e7..fcb8a77a2e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -617,8 +617,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
- 240/471: gnu: Add rust-mp4parse-0.12., (continued)
- 240/471: gnu: Add rust-mp4parse-0.12., guix-commits, 2023/05/03
- 241/471: gnu: Add rust-libwebp-sys-0.4., guix-commits, 2023/05/03
- 243/471: gnu: Add rust-exr-1., guix-commits, 2023/05/03
- 248/471: gnu: rust-console-0.15: Update to 0.15.5., guix-commits, 2023/05/03
- 253/471: gnu: Add rust-jemalloc-sys-0.5., guix-commits, 2023/05/03
- 256/471: gnu: Add rust-lscolors-0.13., guix-commits, 2023/05/03
- 279/471: gnu: rust-bit-set-0.5: Update to 0.5.3., guix-commits, 2023/05/03
- 282/471: gnu: rust-env-logger-0.9: Update to 0.9.3., guix-commits, 2023/05/03
- 287/471: gnu: Add rust-dns-sd-0.1., guix-commits, 2023/05/03
- 280/471: gnu: rust-bytes-1: Update to 1.4.0., guix-commits, 2023/05/03
- 298/471: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.,
guix-commits <=
- 296/471: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/05/03
- 311/471: gnu: Add rust-associative-cache-1., guix-commits, 2023/05/03
- 229/471: gnu: Add rust-lebe-0.5., guix-commits, 2023/05/03
- 231/471: gnu: Add rust-const-fn-assert-0.1., guix-commits, 2023/05/03
- 233/471: gnu: Remove rust-cargon-0.0., guix-commits, 2023/05/03
- 237/471: gnu: Remove rust-askama-derive-0.10., guix-commits, 2023/05/03
- 239/471: gnu: Add rust-webp-0.2., guix-commits, 2023/05/03
- 246/471: etc: teams: Add sequoia.scm to the rust team., guix-commits, 2023/05/03
- 245/471: gnu: gdk-pixbuf: Adjust skipped failing tests., guix-commits, 2023/05/03
- 250/471: gnu: Add rust-crossterm-winapi-0.9., guix-commits, 2023/05/03