amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: gcc-11: Adapt patching for hurd to not use gexp's."

Browse source 
This reverts commit 08acdd0765.

This change is now unnecessary now that gcc-boot0 uses
gexps (a795a02a9d).

* gnu/packages/gcc.scm (gcc-11)[arguments]: Use gexp for modify-phases.
[native-inputs]: Remove.
* gnu/packages/commencement.scm (gcc-boot0)[native-inputs]: Remove.
This commit is contained in:
Christopher Baines 2023-05-07 09:28:55 +01:00
parent fccb48d2ce
commit aad47b1b92
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/commencement.scm
View file

@ -2453,10 +2453,7 @@ exec " gcc "/bin/" program
,@(alist-delete "libc" (%boot0-inputs)))) ,@(alist-delete "libc" (%boot0-inputs))))
;; No need for the native-inputs to build the documentation at this stage. ;; No need for the native-inputs to build the documentation at this stage.
(native-inputs (native-inputs '())))
(if (target-hurd?)
`(("hurd-patch" ,(search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
'()))))
(define perl-boot0 (define perl-boot0
(package (package

17
gnu/packages/gcc.scm
View file

@ -715,25 +715,22 @@ It also includes runtime support libraries for these languages.")
(snippet gcc-canadian-cross-objdump-snippet))) (snippet gcc-canadian-cross-objdump-snippet)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments gcc-8) (substitute-keyword-arguments (package-arguments gcc-8)
((#:phases phases '%standard-phases) ((#:phases phases #~%standard-phases)
(if (target-hurd?) (if (target-hurd?)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'patch-hurd-libpthread (add-after 'unpack 'patch-hurd-libpthread
(lambda _ (lambda _
(invoke "patch" "--force" "-p1" "-i" (define patch
(assoc-ref %build-inputs "hurd-patch"))))) #$(local-file
(search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
(invoke "patch" "--force" "-p1" "-i" patch))))
phases)))) phases))))
(properties (properties
`((compiler-cpu-architectures `((compiler-cpu-architectures
("aarch64" ,@%gcc-11-aarch64-micro-architectures) ("aarch64" ,@%gcc-11-aarch64-micro-architectures)
("armhf" ,@%gcc-11-armhf-micro-architectures) ("armhf" ,@%gcc-11-armhf-micro-architectures)
("x86_64" ,@%gcc-11-x86_64-micro-architectures)) ("x86_64" ,@%gcc-11-x86_64-micro-architectures))
,@(package-properties gcc-8))) ,@(package-properties gcc-8)))))
(native-inputs
`(,@(if (target-hurd?)
`(("hurd-patch" ,(search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
'())
,@(package-native-inputs gcc-8)))))
(define-public gcc-12 (define-public gcc-12
(package (package