mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-30 14:26:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: gcc-muslboot: Apply patches in the package source."

Browse source 
This reverts commit 2512d006e2.

The package fails to unpack in the 'unpack phase
This commit is contained in:
Efraim Flashner 2024-12-17 19:27:33 +02:00
parent 12139343a3
commit e33bffe6b0
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/commencement.scm
View file

@ -2007,17 +2007,13 @@ (define gcc-muslboot
(inherit gcc-muslboot0) (inherit gcc-muslboot0)
(name "gcc-muslboot") (name "gcc-muslboot")
(version "4.6.4") (version "4.6.4")
(source (source (origin
(bootstrap-origin (method url-fetch)
(origin (uri (string-append "mirror://gnu/gcc/gcc-"
(method url-fetch) version "/gcc-" version ".tar.gz"))
(uri (string-append "mirror://gnu/gcc/gcc-" (sha256
version "/gcc-" version ".tar.gz")) (base32
(sha256 "0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk"))))
(base32
"0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk"))
(patches (search-patches "gcc-boot-4.6.4-riscv64-support.patch"
"gcc-boot-4.6.4-riscv64-libstdc++-support.patch")))))
(native-inputs (native-inputs
(modify-inputs (%boot-tcc-musl-inputs) (modify-inputs (%boot-tcc-musl-inputs)
(replace "gcc" gcc-muslboot0) (replace "gcc" gcc-muslboot0)
@ -2048,7 +2044,13 @@ (define gcc-muslboot
else else
_cpp_define_builtin (pfile, \"__cplusplus 199711L\"); _cpp_define_builtin (pfile, \"__cplusplus 199711L\");
}"))))) }")))))
(delete 'apply-riscv64-patch) (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))))
(replace 'setenv (replace 'setenv
(lambda _ (lambda _
(setenv "CC" "musl-gcc") (setenv "CC" "musl-gcc")