guix_mirror_bot pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 7b48ad283d405c4a69d5b1d53e63fef4268d5e96
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Tue Dec 17 09:33:51 2024 +0200
gnu: gcc-muslboot0: Apply patches in the package source.
* gnu/packages/commencement.scm (gcc-muslboot0)[source]: Add patch.
[arguments]: Remove custom phase applying patch.
(gcc-muslboot): Adjust accordingly.
Change-Id: Ie502ac2db65b8928b84ddbcb65e82151156f08e7
---
gnu/packages/commencement.scm | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 16b21358f5..8b398387b0 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1823,13 +1823,15 @@ ac_cv_c_float_format='IEEE (little-endian)'
(inherit gcc-4.7)
(name "gcc-muslboot0")
(version "4.6.4")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-"
- version "/gcc-core-" version ".tar.gz"))
- (sha256
- (base32
- "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75"))))
+ (source
+ (bootstrap-origin
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-"
+ version "/gcc-core-" version ".tar.gz"))
+ (sha256
+ (base32 "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75"))
+ (patches (search-patches "gcc-boot-4.6.4-riscv64-support.patch")))))
(outputs '("out"))
(inputs (list gmp-boot mpfr-boot mpc-boot))
(native-inputs (%boot-tcc-musl-inputs))
@@ -1880,12 +1882,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--disable-build-with-cxx"))
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'apply-riscv64-patch
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((patch-file
- #$(local-file
- (search-patch
"gcc-boot-4.6.4-riscv64-support.patch"))))
- (invoke "patch" "--force" "-p1" "-i" patch-file))))
(add-after 'unpack 'fix-alloca
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (list "libiberty/alloca.c"
@@ -1910,7 +1906,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
gnu-user suffix
(string-append libc "/lib/libc.so")))))))
- (add-after 'apply-riscv64-patch 'patch-for-modern-libc
+ (add-after 'unpack 'patch-for-modern-libc
(lambda _
(for-each
(lambda (dir)
@@ -2073,7 +2069,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
else
_cpp_define_builtin (pfile, \"__cplusplus 199711L\");
}")))))
- (delete 'apply-riscv64-patch)
(replace 'setenv
(lambda _
(setenv "CC" "musl-gcc")
