bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-26 04:25:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc: Merge with glibc/hurd.

Browse source 
* 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>
This commit is contained in:
Yelninei 2025-05-27 19:06:24 +00:00 • committed by Andreas Enge
parent f9b639a46f
commit 72dbcff937
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/base.scm
View file

@ -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