[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
298/475: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.
From: |
guix-commits |
Subject: |
298/475: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround. |
Date: |
Sun, 7 May 2023 12:47:43 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit e96ccb3152f96fd2fa11019fbfec3101c9e2a7a0
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
- 263/475: gnu: Add rust-test-case-macros-2., (continued)
- 263/475: gnu: Add rust-test-case-macros-2., guix-commits, 2023/05/07
- 268/475: gnu: Add rust-argmax-0.3., guix-commits, 2023/05/07
- 267/475: gnu: Add rust-faccess-0.2., guix-commits, 2023/05/07
- 264/475: gnu: Add rust-option-set-0.1., guix-commits, 2023/05/07
- 270/475: gnu: rust-similar-asserts-1: Update to 1.4.2., guix-commits, 2023/05/07
- 275/475: gnu: rust-gif-0.11: Remove duplicate definition., guix-commits, 2023/05/07
- 281/475: gnu: rust-derive-arbitrary-1: Update to 1.2.3., guix-commits, 2023/05/07
- 284/475: gnu: rust-ring-0.16: Remove pregenerated files., guix-commits, 2023/05/07
- 290/475: gnu: Add rust-libmdns-0.6., guix-commits, 2023/05/07
- 296/475: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/05/07
- 298/475: gnu: rust-1.61: Remove riscv64-linux jemalloc workaround.,
guix-commits <=
- 304/475: gnu: sniffglue: Add missing input., guix-commits, 2023/05/07
- 67/475: gnu: Add rust-test-cert-gen-0.7., guix-commits, 2023/05/07
- 73/475: gnu: Add rust-toml-test-harness-0.4., guix-commits, 2023/05/07
- 74/475: gnu: Add rust-toml-test-data-1., guix-commits, 2023/05/07
- 78/475: gnu: Add rust-trycmd-0.14., guix-commits, 2023/05/07
- 93/475: gnu: Add rust-serde-spanned-0.6., guix-commits, 2023/05/07
- 127/475: gnu: rust-windows-x86-64-gnu-0.42: Update to 0.42.1., guix-commits, 2023/05/07
- 130/475: gnu: rust-zeroize-derive-1: Update to 1.3.3., guix-commits, 2023/05/07
- 134/475: gnu: rust-bzip2-sys-0.1: Update to 0.1.11., guix-commits, 2023/05/07
- 138/475: gnu: Add rust-zstd-sys-2., guix-commits, 2023/05/07