[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: glibc: Move patches for the Hurd from cross-libc.
From: |
guix-commits |
Subject: |
01/05: gnu: glibc: Move patches for the Hurd from cross-libc. |
Date: |
Mon, 26 Oct 2020 10:40:43 -0400 (EDT) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 6690b6d1e7333137e4731ec5e4bb30d6637c3237
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Oct 26 13:41:25 2020 +0100
gnu: glibc: Move patches for the Hurd from cross-libc.
* gnu/packages/cross-base.scm (cross-libc)[arguments]: Remove
"patch-libc/hurd"
stage.
[native-inputs]: Move hurd patches to...
* gnu/packages/base.scm (glibc)[source]: ...here.
---
gnu/packages/base.scm | 4 +++-
gnu/packages/cross-base.scm | 21 +--------------------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index cc10a4b..565d4db 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -702,7 +702,9 @@ the store.")
"glibc-supported-locales.patch"
"glibc-hurd-clock_t_centiseconds.patch"
"glibc-hurd-clock_gettime_monotonic.patch"
- "glibc-hurd-signal-sa-siginfo.patch"))))
+ "glibc-hurd-signal-sa-siginfo.patch"
+ "glibc-hurd-mach-print.patch"
+ "glibc-hurd-gettyent.patch"))))
(build-system gnu-build-system)
;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index b35a3cb..20037ac 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -521,16 +521,7 @@ and the cross tool chain."
(("/[^ ]+/lib/libc.so.0.3")
(string-append out "/lib/libc.so.0.3"
" libmachuser.so
libhurduser.so"))))
- #t))
- ;; TODO: move to glibc in the next rebuild cycle
- (add-after 'unpack 'patch-libc/hurd
- (lambda* (#:key inputs #:allow-other-keys)
- (for-each
- (lambda (name)
- (let ((patch (assoc-ref inputs name)))
- (invoke "patch" "-p1" "--force" "-i" patch)))
- '("hurd-mach-print.patch"
- "hurd-gettyent.patch")))))
+ #t)))
'())))))
;; Shadow the native "kernel-headers" because glibc's recipe expects
the
@@ -543,16 +534,6 @@ and the cross tool chain."
(native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils)
- ,@(if (hurd-triplet? target)
- `(("cross-mig"
- ,@(assoc-ref (package-native-inputs xheaders)
- "cross-mig"))
- ;; TODO: move to glibc in the next rebuild
cycle
- ("hurd-mach-print.patch"
- ,@(search-patches
"glibc-hurd-mach-print.patch"))
- ("hurd-gettyent.patch"
- ,@(search-patches
"glibc-hurd-gettyent.patch")))
- '())
,@(package-inputs libc) ;FIXME: static-bash
,@(package-native-inputs libc))))))