From e33bffe6b03db00b37ac82b634ae4641bba481cb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Dec 2024 19:27:33 +0200 Subject: [PATCH] Revert "gnu: gcc-muslboot: Apply patches in the package source." This reverts commit 2512d006e2d5201257cae5c3d47476110dacc882. The package fails to unpack in the 'unpack phase --- gnu/packages/commencement.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8b1ca17f49..100b9a9bfe 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2007,17 +2007,13 @@ (define gcc-muslboot (inherit gcc-muslboot0) (name "gcc-muslboot") (version "4.6.4") - (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"))))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-" version ".tar.gz")) + (sha256 + (base32 + "0vvkzxi8wvaj9wzdk0hv12nj9kqymkpjqzasj2ri8nc107dk7pjk")))) (native-inputs (modify-inputs (%boot-tcc-musl-inputs) (replace "gcc" gcc-muslboot0) @@ -2048,7 +2044,13 @@ (define gcc-muslboot else _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 (lambda _ (setenv "CC" "musl-gcc")