From 72dbcff9377d693ba2fe7e8563d7e40de6e19765 Mon Sep 17 00:00:00 2001 From: Yelninei Date: Tue, 27 May 2025 19:06:24 +0000 Subject: [PATCH] gnu: glibc: Merge with glibc/hurd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- 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 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