From 6cdd444a56e672d248ba411d41faf2810a14f8cc Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 20 Mar 2023 23:10:38 +0100 Subject: gnu: gcc@11: Patch libpthread on GNU/Hurd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gcc.scm (gcc-11)[arguments]: Add 'patch-hurd-libpthread' phase. * gnu/packages/patches/gcc-11-libstdc++-hurd-libpthread.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Co-authored-by: Ludovic Courtès --- gnu/packages/gcc.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gcc.scm') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index ce6e3e7a83..a511cdbc45 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -706,7 +706,18 @@ It also includes runtime support libraries for these languages.") "gcc-10-tree-sra-union-handling.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) - + (arguments + (substitute-keyword-arguments (package-arguments gcc-8) + ((#:phases phases #~%standard-phases) + (if (target-hurd?) + #~(modify-phases #$phases + (add-after 'unpack 'patch-hurd-libpthread + (lambda _ + (define patch + #$(local-file + (search-patch "gcc-11-libstdc++-hurd-libpthread.patch"))) + (invoke "patch" "--force" "-p1" "-i" patch)))) + phases)))) (properties `((compiler-cpu-architectures ("aarch64" ,@%gcc-11-aarch64-micro-architectures) -- cgit v1.2.3