From 2512d006e2d5201257cae5c3d47476110dacc882 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Dec 2024 09:28:08 +0200 Subject: [PATCH] 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 --- gnu/packages/commencement.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f0eedca5f8..3a4c434f25 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -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")