diff --git a/gnu/local.mk b/gnu/local.mk index 8d87c52058..31d27ff506 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1498,7 +1498,6 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-2.41-symlink.patch \ %D%/packages/patches/glibc-hurd-xstate.patch \ %D%/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch \ - %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \ %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5ee1a65f39..bf8489fa2a 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -919,10 +919,11 @@ the store.") "glibc-hurd-gettyent.patch" "glibc-hurd-getauxval.patch" "glibc-hurd-pthread_setcancelstate.patch" + "glibc-hurd-signal-fpe-exception.patch" + "glibc-hurd-xstate.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 @@ -1544,18 +1545,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 - (hidden-package - (package/inherit glibc - (source - (origin - (inherit (package-source glibc)) - (patches - (append (map search-patch - (delete "glibc-hurd64-intr-msg-clobber.patch" %glibc-patches)) - (search-patches - "glibc-hurd-signal-fpe-exception.patch" - "glibc-hurd-xstate.patch")))))))) +(define-public glibc/hurd glibc) (define-public glibc/hurd-headers (package/inherit glibc/hurd