[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/16: gnu: rust-1.74: Fix build on riscv64-linux.
From: |
guix-commits |
Subject: |
02/16: gnu: rust-1.74: Fix build on riscv64-linux. |
Date: |
Tue, 23 Jan 2024 09:35:34 -0500 (EST) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 45926aac0c3bf0666b74a85aca0600195aa3f6f8
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Jan 23 14:01:45 2024 +0200
gnu: rust-1.74: Fix build on riscv64-linux.
* gnu/packages/rust.scm (rust-1.74)[arguments]: When building for
riscv64-linux delete 'revert-riscv-pause-instruction phase.
Change-Id: I59120e8dae995fca52b192b07e265db20d9281e7
---
gnu/packages/rust.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 42be029c28..164404111e 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -926,7 +926,15 @@ safety and thread safety guarantees.")
;; Adjust vendored dependency to explicitly use rustix with libc
backend.
(substitute* "vendor/tempfile/Cargo.toml"
(("features = \\[\"fs\"" all)
- (string-append all ", \"use-libc\""))))))))))
+ (string-append all ", \"use-libc\"")))))))
+ (arguments
+ (if (target-riscv64?)
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; This phase is no longer needed.
+ (delete 'revert-riscv-pause-instruction))))
+ (package-arguments base-rust))))))
(define rust-1.75
(let ((base-rust (rust-bootstrapped-package rust-1.74 "1.75.0"
- 09/16: gnu: Add rust-inline-c-macro-0.1., (continued)
- 09/16: gnu: Add rust-inline-c-macro-0.1., guix-commits, 2024/01/23
- 10/16: gnu: Add rust-inline-c-0.1., guix-commits, 2024/01/23
- 11/16: gnu: Add rust-keyframe-1., guix-commits, 2024/01/23
- 03/16: gnu: rust-lz4-1: Update to 1.24.0., guix-commits, 2024/01/23
- 01/16: gnu: rbw: Accept newer versions of dependencies., guix-commits, 2024/01/23
- 06/16: gnu: Add rust-target-lexicon-0.11., guix-commits, 2024/01/23
- 12/16: gnu: Add rust-spin-sleep-1., guix-commits, 2024/01/23
- 13/16: gnu: Add rust-sd-notify-0.4., guix-commits, 2024/01/23
- 08/16: gnu: Add rust-libdeflater-1., guix-commits, 2024/01/23
- 15/16: gnu: Add rust-fast-image-resize-2., guix-commits, 2024/01/23
- 02/16: gnu: rust-1.74: Fix build on riscv64-linux.,
guix-commits <=
- 07/16: gnu: Add rust-libdeflate-sys-1., guix-commits, 2024/01/23
- 14/16: gnu: Add rust-resize-0.7., guix-commits, 2024/01/23
- 16/16: gnu: Add swww., guix-commits, 2024/01/23