diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 16:45:17 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 16:45:17 +0200 |
| commit | 5f3f70391809f8791c55c05bd1646bc58508fa2c (patch) | |
| tree | 17d52b40817be205a93f392cf002494e3a9d7e5c /gnu/packages/patches/glibc-supported-locales.patch | |
| parent | 1290855490baf03944dc85d8353c2b8cedac5256 (diff) | |
| download | guix-patches-5f3f70391809f8791c55c05bd1646bc58508fa2c.tar guix-patches-5f3f70391809f8791c55c05bd1646bc58508fa2c.tar.gz | |
gnu: glibc: Update to 2.29.
* gnu/packages/patches/glibc-bootstrap-system.patch,
gnu/packages/patches/glibc-supported-locales.patch: Adjust for glibc 2.29.
* gnu/packages/patches/glibc-2.28-supported-locales.patch,
gnu/packages/patches/glibc-CVE-2019-7309.patch,
gnu/packages/patches/glibc-CVE-2019-9169.patch,
gnu/packages/patches/glibc-2.29-git-updates.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/base.scm (glibc): Update to 2.29.
[source](patches): Add 'glibc-CVE-2019-7309.patch',
'glibc-CVE-2019-9169.patch', and 'glibc-2.29-git-updates.patch'. Remove
'glibc-hurd-magic-pid.patch'.
[native-inputs]: Add PYTHON-MINIMAL.
(glibc-2.28): New public variable.
* gnu/packages/commencement.scm (expat-sans-tests, python-boot0): New variables.
(glibc-final-with-bootstrap-bash)[native-inputs]: Add PYTHON-BOOT0.
* gnu/packages/python.scm (python-3.7)[arguments]: Disable test that fails
with glibc 2.29.
Diffstat (limited to 'gnu/packages/patches/glibc-supported-locales.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-supported-locales.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch index 2888052bb8..05865dc7be 100644 --- a/gnu/packages/patches/glibc-supported-locales.patch +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -2,11 +2,11 @@ This patch is taken from debian's glibc package (generate-supported.mk). It install the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. -diff --git a/localedata/Makefile.old b/localedata/Makefile -index 34877c0..a61d9b9 100644 ---- a/localedata/Makefile.old +diff --git a/localedata/Makefile b/localedata/Makefile +index 65079f9eb8..14818f84e0 100644 +--- a/localedata/Makefile +++ b/localedata/Makefile -@@ -91,7 +91,8 @@ endif +@@ -169,7 +169,8 @@ endif # Files to install. install-others := $(addprefix $(inst_i18ndir)/, \ $(addsuffix .gz, $(charmaps)) \ @@ -16,7 +16,7 @@ index 34877c0..a61d9b9 100644 tests: $(objdir)/iconvdata/gconv-modules -@@ -195,6 +196,14 @@ endif +@@ -380,6 +381,14 @@ endif include SUPPORTED @@ -28,6 +28,6 @@ index 34877c0..a61d9b9 100644 + $(make-target-directory) + $(INSTALL_DATA) LOCALES $@ + - INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) - - # Sometimes the whole collection of locale files should be installed. + INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES)) + INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES)) +
\ No newline at end of file |