mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-18 21:46:35 +01:00
gnu: gcc-muslboot: Apply patches in the package source.
* gnu/packages/commencement.scm (gcc-muslboot)[source]: Add patches. [arguments]: Remove custom phases applying patches. Change-Id: I01b9af67189c0213fd60d2822dca7975ddf4a2a8
This commit is contained in:
parent
02eb5a6001
commit
2512d006e2
1 changed files with 12 additions and 14 deletions
|
@ -2007,13 +2007,17 @@ (define gcc-muslboot
|
|||
(inherit gcc-muslboot0)
|
||||
(name "gcc-muslboot")
|
||||
(version "4.6.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk"))))
|
||||
(source
|
||||
(bootstrap-origin
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gcc/gcc-"
|
||||
version "/gcc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk"))
|
||||
(patches (search-patches "gcc-boot-4.6.4-riscv64-support.patch"
|
||||
"gcc-boot-4.6.4-riscv64-libstdc++-support.patch")))))
|
||||
(native-inputs
|
||||
(modify-inputs (%boot-tcc-musl-inputs)
|
||||
(replace "gcc" gcc-muslboot0)
|
||||
|
@ -2044,13 +2048,7 @@ (define gcc-muslboot
|
|||
else
|
||||
_cpp_define_builtin (pfile, \"__cplusplus 199711L\");
|
||||
}")))))
|
||||
(add-after 'apply-riscv64-patch 'apply-second-riscv64-patch
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((patch-file
|
||||
#$(local-file
|
||||
(search-patch
|
||||
"gcc-boot-4.6.4-riscv64-libstdc++-support.patch"))))
|
||||
(invoke "patch" "--force" "-p1" "-i" patch-file))))
|
||||
(delete 'apply-riscv64-patch)
|
||||
(replace 'setenv
|
||||
(lambda _
|
||||
(setenv "CC" "musl-gcc")
|
||||
|
|
Loading…
Reference in a new issue