me
/
guix
Archived
1
0
Fork 0

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

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

Change-Id: Iaa1f1b0ac70b36b6ac8a46e6789ce14d057fde08
master
Efraim Flashner 2024-01-16 20:45:57 +02:00
parent 930bba1458
commit aa4f4811c6
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 21 additions and 0 deletions

View File

@ -657,6 +657,27 @@ safety and thread safety guarantees.")
(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"))
;; ERROR: could not find native static library
;; `rustix_outline_powerpc64`, perhaps an -L flag is missing?
;; Adjust rustix to always build with cc.
(substitute* "src/bootstrap/Cargo.lock"
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* "vendor/fd-lock/Cargo.toml"
(("\"fs\"") "\"fs\", \"cc\""))
;; 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)$"))))
(patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch")) (patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch"))
(patch-flags '("-p1" "--reverse")))) (patch-flags '("-p1" "--reverse"))))
(arguments (arguments