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 <ludo@gnu.org>

1 files changed, 8 insertions, 14 deletions

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 110b004579d..de6704bbe13 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -910,7 +910,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
@@ -1664,19 +1670,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