ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc: Simplify application of Hurd-specific pthread patch.

Browse source 
* gnu/packages/gcc.scm (gcc-11): Apply gcc-11-libstdc++-hurd-libpthread.patch
unconditionally.
(gcc-12): Also apply gcc-11-libstdc++-hurd-libpthread.patch.

Change-Id: I80e2b2adb5636e1bff4536c5a0a348955454e81d
This commit is contained in:
Josselin Poiret 2024-02-01 14:35:16 +01:00 committed by Ludovic Courtès
parent 70b2015ec5
commit 3908672261
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/gcc.scm
View file

@ -741,21 +741,10 @@ (define-public gcc-11
(base32
"1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z"))
(patches (search-patches "gcc-9-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))
"gcc-5.0-libvtv-runpath.patch"
"gcc-11-libstdc++-hurd-libpthread.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)
@ -777,7 +766,8 @@ (define-public gcc-12
(base32
"0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh"))
(patches (search-patches "gcc-12-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))
"gcc-5.0-libvtv-runpath.patch"
"gcc-11-libstdc++-hurd-libpthread.patch"))
(modules '((guix build utils)))
(snippet gcc-canadian-cross-objdump-snippet)))
(properties