guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.
commit 89919c9372f46c05b4e12150321dbcf1d891792b
Author: Yelninei <yelni...@tutamail.com>
AuthorDate: Tue May 27 19:06:24 2025 +0000
gnu: glibc: Merge with glibc/hurd.
* gnu/packages/base.scm (%glibc-patches): Add patches from glibc/hurd.
(glibc/hurd): Define to glibc.
Change-Id: I6acc83bafeafadc0e257575fd8b9641e4cbf1f92
Signed-off-by: Ludovic Courtès <l...@gnu.org>
---
gnu/packages/base.scm | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index a916320b76..484851c983 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -912,7 +912,13 @@ the store.")
"glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch"
"glibc-hurd-mach-print.patch"
"glibc-hurd-gettyent.patch"
- "glibc-hurd-getauxval.patch"))
+ "glibc-hurd-getauxval.patch"
+ "glibc-hurd-pthread_setcancelstate.patch"
+ "glibc-hurd-2.41-pthread-once.patch"
+ "glibc-hurd-2.41-pthread-sigmask.patch"
+ "glibc-hurd-2.41-symlink.patch"
+ "glibc-hurd64-intr-msg-clobber.patch"
+ "glibc-hurd64-gcc-14.2-tls-bug.patch"))
(define-public glibc
;; This is the GNU C Library, used on GNU/Linux and GNU/Hurd. Prior to
@@ -1666,19 +1672,7 @@ variety of options. It is an alternative to the shell
\"type\" built-in
command.")
(license gpl3+))) ; some files are under GPLv2+
-(define-public glibc/hurd
- (package/inherit glibc
- (source
- (origin
- (inherit (package-source glibc))
- (patches
- (append (origin-patches (package-source glibc))
- (search-patches "glibc-hurd-pthread_setcancelstate.patch"
- "glibc-hurd-2.41-pthread-once.patch"
- "glibc-hurd-2.41-pthread-sigmask.patch"
- "glibc-hurd-2.41-symlink.patch"
- "glibc-hurd64-intr-msg-clobber.patch"
- "glibc-hurd64-gcc-14.2-tls-bug.patch")))))))
+(define-public glibc/hurd glibc)
(define-public glibc/hurd-headers
(package/inherit glibc/hurd
