diff options
| author | Kei Kebreau <kkebreau@posteo.net> | 2019-07-04 06:49:29 -0400 |
|---|---|---|
| committer | Kei Kebreau <kkebreau@posteo.net> | 2019-07-09 12:15:52 -0400 |
| commit | d4137d84ac75edaf2739578d0868cd77dd6da43c (patch) | |
| tree | ec389b86ea454880ba4494c97691314018a23c3a /gnu/local.mk | |
| parent | ca3757e1c2fdc1576d17239a57f0a493a47bc6dc (diff) | |
| download | guix-d4137d84ac75edaf2739578d0868cd77dd6da43c.tar guix-d4137d84ac75edaf2739578d0868cd77dd6da43c.tar.gz | |
gnu: make-glibc-locales: Adjust patch for glibc 2.29.
The patch for glibc 2.28 and earlier replaces the same content, but the context
in the patch is different enough to fail to merge.
* gnu/packages/base.scm (make-glibc-locales)[source]: Add patch.
* gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.29 and move old
file...
* gnu/packages/patches/glibc-locales-2.28.patch: ...here.
* gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f63ff1ff1e..e142122e6b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,6 +867,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ + %D%/packages/patches/glibc-locales-2.28.patch \ %D%/packages/patches/glibc-o-largefile.patch \ %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ |