[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Revert "gnu: gcc-11: Adapt patching for hurd to not use gexp's."
From: |
guix-commits |
Subject: |
01/02: Revert "gnu: gcc-11: Adapt patching for hurd to not use gexp's." |
Date: |
Sun, 7 May 2023 07:18:07 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit aad47b1b925262eb27ee1d4fcd19461deebb12e6
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sun May 7 09:28:55 2023 +0100
Revert "gnu: gcc-11: Adapt patching for hurd to not use gexp's."
This reverts commit 08acdd0765b5f4fbfafa699a823ea7985d4d35a7.
This change is now unnecessary now that gcc-boot0 uses
gexps (a795a02a9d988be5a762886620f7bb6a95e7ffdb).
* gnu/packages/gcc.scm (gcc-11)[arguments]: Use gexp for modify-phases.
[native-inputs]: Remove.
* gnu/packages/commencement.scm (gcc-boot0)[native-inputs]: Remove.
---
gnu/packages/commencement.scm | 5 +----
gnu/packages/gcc.scm | 21 +++++++++------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c4b50ec2c4..a6d3fcfce2 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2453,10 +2453,7 @@ exec " gcc "/bin/" program
,@(alist-delete "libc" (%boot0-inputs))))
;; No need for the native-inputs to build the documentation at this stage.
- (native-inputs
- (if (target-hurd?)
- `(("hurd-patch" ,(search-patch
"gcc-11-libstdc++-hurd-libpthread.patch")))
- '()))))
+ (native-inputs '())))
(define perl-boot0
(package
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index d1c79b8dc2..bdcc3f0508 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -715,25 +715,22 @@ It also includes runtime support libraries for these
languages.")
(snippet gcc-canadian-cross-objdump-snippet)))
(arguments
(substitute-keyword-arguments (package-arguments gcc-8)
- ((#:phases phases '%standard-phases)
+ ((#:phases phases #~%standard-phases)
(if (target-hurd?)
- `(modify-phases ,phases
- (add-after 'unpack 'patch-hurd-libpthread
- (lambda _
- (invoke "patch" "--force" "-p1" "-i"
- (assoc-ref %build-inputs "hurd-patch")))))
+ #~(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)
("armhf" ,@%gcc-11-armhf-micro-architectures)
("x86_64" ,@%gcc-11-x86_64-micro-architectures))
- ,@(package-properties gcc-8)))
- (native-inputs
- `(,@(if (target-hurd?)
- `(("hurd-patch" ,(search-patch
"gcc-11-libstdc++-hurd-libpthread.patch")))
- '())
- ,@(package-native-inputs gcc-8)))))
+ ,@(package-properties gcc-8)))))
(define-public gcc-12
(package