amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-rust-sysroot: Adjust for newer rust version.

Browse source 
* gnu/packages/rust.scm (make-rust-sysroot)[arguments]: Adjust
'unbundle-xz phase for changes in vendored libraries.  Delete inherited
'enable-profiling phase.

Change-Id: I27a5fc2e2a3f9ad3a32b71d1d28d984fb5bcc37e
This commit is contained in:
Efraim Flashner 2024-09-16 08:20:02 +03:00
parent 1b4106549f
commit defbf22797
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/rust.scm
View file

@ -1418,10 +1418,10 @@ exec -a \"$0\" \"~a\" \"$@\""
#~(modify-phases #$phases #~(modify-phases #$phases
(add-after 'unpack 'unbundle-xz (add-after 'unpack 'unbundle-xz
(lambda _ (lambda _
(delete-file-recursively "vendor/lzma-sys/xz-5.2") (delete-file-recursively "vendor/lzma-sys-0.1.20/xz-5.2")
;; Remove the option of using the static library. ;; Remove the option of using the static library.
;; This is necessary for building the sysroot. ;; This is necessary for building the sysroot.
(substitute* "vendor/lzma-sys/build.rs" (substitute* "vendor/lzma-sys-0.1.20/build.rs"
(("!want_static && ") "")))) (("!want_static && ") ""))))
#$@(if (target-mingw? target) #$@(if (target-mingw? target)
`((add-after 'set-env 'patch-for-mingw `((add-after 'set-env 'patch-for-mingw
@ -1446,7 +1446,9 @@ exec -a \"$0\" \"~a\" \"$@\""
":")) ":"))
;; When building a rust-sysroot this crate is only used for ;; When building a rust-sysroot this crate is only used for
;; the rust-installer. ;; the rust-installer.
(substitute* "vendor/num_cpus/src/linux.rs" (substitute* '("vendor/num_cpus-1.13.0/src/linux.rs"
"vendor/num_cpus-1.13.1/src/linux.rs"
"vendor/num_cpus-1.16.0/src/linux.rs")
(("\\.ceil\\(\\)") "")) (("\\.ceil\\(\\)") ""))
;; gcc doesn't recognize this flag. ;; gcc doesn't recognize this flag.
(substitute* (substitute*
@ -1536,6 +1538,7 @@ ar = \"" (search-input-file inputs (string-append "/bin/" #$(ar-for-target targe
(replace 'install (replace 'install
(lambda _ (lambda _
(invoke "./x.py" "install" "library/std"))) (invoke "./x.py" "install" "library/std")))
(delete 'enable-profiling)
(delete 'install-rust-src) (delete 'install-rust-src)
(delete 'wrap-rust-analyzer) (delete 'wrap-rust-analyzer)
(delete 'wrap-rustc))))) (delete 'wrap-rustc)))))