ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 02:59:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust-1.70: Fix building on powerpc64le-linux.

Browse source 
* gnu/packages/rust.scm (rust-1.70)[source]: Adjust snippet to fix
building rustix on all architectures.

Change-Id: Ic9f57e00c8602cd400db65e5b2c2499e972bef17
This commit is contained in:
Efraim Flashner 2024-01-16 20:48:31 +02:00
parent c4f676b24e
commit fb295a6a12
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/rust.scm
View file

@ -786,6 +786,22 @@ (define-public rust-1.70
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Adjust rustix to always build with cc.
(substitute* "Cargo.lock"
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* '("vendor/is-terminal/Cargo.toml"
"vendor/is-terminal-0.4.4/Cargo.toml")
(("\"termios\"") "\"termios\", \"cc\""))
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))
;; Rust 1.70 adds the rustix library which depends on the vendored ;; Rust 1.70 adds the rustix library which depends on the vendored
;; fd-lock crate. The fd-lock crate uses Outline assembly which expects ;; fd-lock crate. The fd-lock crate uses Outline assembly which expects
;; a precompiled static library. Enabling the "cc" feature tells the ;; a precompiled static library. Enabling the "cc" feature tells the