summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorChris Marusich <cmmarusich@gmail.com>2021-07-10 16:49:49 -0700
committerChris Marusich <cmmarusich@gmail.com>2021-07-21 16:02:42 -0700
commit93a5e89008af440655527d03d62d4726683a89ac (patch)
tree69a56a467fc56c1d106748909b16acfaf4c92f9d /gnu/local.mk
parentc3e33474b965ac1b7d91b69b026630e7c707e289 (diff)
downloadguix-93a5e89008af440655527d03d62d4726683a89ac.tar.gz
gnu: glibc-2.31: Restore patches.
Commit 87961fc965b96ac0c7a5909ac2faab2d023b5339 inadvertently modified the
patch set for glibc-2.31.  This change restores the original patch set.

Fixes: <https://bugs.gnu.org/49516>.

* gnu/packages/base.scm (glibc-2.31) [source]: Use the same patches as glibc,
but replace glibc-hurd-clock_gettime_monotonic.patch with
glibc-2.31-hurd-clock_gettime_monotonic.patch, and add
glibc-hurd-signal-sa-siginfo.patch.
* gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch: Add it.
* gnu/packages/patches/glibc-hurd-signal-sa-siginfo.patch: Add it.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index e4d4f85868..92b00ec719 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1115,10 +1115,12 @@ dist_patch_DATA =						\
   %D%/packages/patches/glibc-dl-cache.patch			\
   %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch	\
   %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch	\
+  %D%/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch	\
   %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch	\
   %D%/packages/patches/glibc-hurd-gettyent.patch		\
   %D%/packages/patches/glibc-hurd-mach-print.patch		\
   %D%/packages/patches/glibc-hurd-magic-pid.patch		\
+  %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch	\
   %D%/packages/patches/glibc-ldd-powerpc.patch			\
   %D%/packages/patches/glibc-ldd-x86_64.patch			\
   %D%/packages/patches/glibc-locales.patch			\