diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-01-16 20:46:55 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-02-20 13:57:42 +0200 |
| commit | b3b273ff89eb120caf5e99ec419fe710f4cc4ac4 (patch) | |
| tree | 662e9bb9bc07a72f7d45611cd6ef6f651e9be404 /gnu/packages/rust.scm | |
| parent | aa4f4811c60ec8925aa724a9abfc737815a5ff0f (diff) | |
gnu: rust-1.67: Fix building on powerpc64le-linux.
* gnu/packages/rust.scm (rust-1.67)[source]: Adjust snippet to fix
building rustix on all architectures.
Change-Id: I3bfd30d541574daae6223066c57c2d311e436075
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b7ceca6be7e..3680ab12f12 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm | |||
| @@ -715,6 +715,31 @@ safety and thread safety guarantees.") | |||
| 715 | rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26"))) | 715 | rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26"))) |
| 716 | (package | 716 | (package |
| 717 | (inherit base-rust) | 717 | (inherit base-rust) |
| 718 | (source | ||
| 719 | (origin | ||
| 720 | (inherit (package-source base-rust)) | ||
| 721 | (snippet | ||
| 722 | '(begin | ||
| 723 | (for-each delete-file-recursively | ||
| 724 | '("src/llvm-project" | ||
| 725 | "vendor/openssl-src/openssl" | ||
| 726 | "vendor/tikv-jemalloc-sys/jemalloc")) | ||
| 727 | ;; Adjust rustix to always build with cc. | ||
| 728 | (substitute* '("Cargo.lock" | ||
| 729 | "src/bootstrap/Cargo.lock") | ||
| 730 | (("\"errno\",") "\"cc\",\n \"errno\",")) | ||
| 731 | ;; Add a dependency on the the 'cc' feature of rustix. | ||
| 732 | (substitute* "vendor/fd-lock/Cargo.toml" | ||
| 733 | (("\"fs\"") "\"fs\", \"cc\"")) | ||
| 734 | (substitute* "vendor/is-terminal/Cargo.toml" | ||
| 735 | (("\"termios\"") "\"termios\", \"cc\"")) | ||
| 736 | ;; Remove vendored dynamically linked libraries. | ||
| 737 | ;; find . -not -type d -executable -exec file {} \+ | grep ELF | ||
| 738 | (delete-file "vendor/vte/vim10m_match") | ||
| 739 | (delete-file "vendor/vte/vim10m_table") | ||
| 740 | ;; Also remove the bundled (mostly Windows) libraries. | ||
| 741 | (for-each delete-file | ||
| 742 | (find-files "vendor" "\\.(a|dll|exe|lib)$")))))) | ||
| 718 | (inputs (modify-inputs (package-inputs base-rust) | 743 | (inputs (modify-inputs (package-inputs base-rust) |
| 719 | (replace "llvm" llvm-15)))))) | 744 | (replace "llvm" llvm-15)))))) |
| 720 | 745 | ||
