diff options
| author | Andreas Enge <andreas@enge.fr> | 2025-10-23 18:40:47 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-10-23 18:40:47 +0200 |
| commit | 463fb924525101dee8ccf5864bf62b8303f38d63 (patch) | |
| tree | acfc43698e8fb6e3b850f1c67004e9a7f9edbdb9 /gnu | |
| parent | 140b6abef4bdbbd33a58670b44d0104eb62eeca2 (diff) | |
gnu: glibc-locales: Remove unused patch.
* gnu/packages/patches/glibc-locales-2.28.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister file.
* gnu/packages/base.scm (make-glibc-locales): Remove unused branch of
conditional.
Change-Id: I853cbd0f8724a57d15af3fbb1aed3bdf1ef78e0e
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/base.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/glibc-locales-2.28.patch | 31 |
3 files changed, 1 insertions, 40 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 816f68cd6f3..8ec4e6216b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1474,7 +1474,6 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-ldd-powerpc.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-reinstate-prlimit64-fallback.patch \ %D%/packages/patches/glibc-skip-c++.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 602158687f8..107eb880306 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1492,14 +1492,7 @@ with the Linux kernel.") (inherit glibc) (name "glibc-locales") (source (origin (inherit (package-source glibc)) - ;; 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. - (patches (cons (search-patch - (if (version>=? (package-version glibc) - "2.29") - "glibc-locales.patch" - "glibc-locales-2.28.patch")) + (patches (cons (search-patch "glibc-locales.patch") (origin-patches (package-source glibc)))))) (synopsis "All the locales supported by the GNU C Library") (description diff --git a/gnu/packages/patches/glibc-locales-2.28.patch b/gnu/packages/patches/glibc-locales-2.28.patch deleted file mode 100644 index 31ee6c1ff35..00000000000 --- a/gnu/packages/patches/glibc-locales-2.28.patch +++ /dev/null @@ -1,31 +0,0 @@ -This patch allows us to use glibc's build system to build locales -in a package separate from glibc. - - 1. Use 'localedef' from $PATH since we are not rebuilding it. - 2. Use '--no-archive' to avoid building the big locale archive, and - because the already-built 'localedef' would want to write it - to '/run/current-system/locale', which is not possible. - 3. Pass $(inst_complocaledir)/$$locale to install files in the right - place, and because otherwise, 'localedef' fails with: - "cannot write output files to `(null)'". - ---- glibc-2.27/localedata/Makefile -+++ glibc-2.27/localedata/Makefile -@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) - - # Sometimes the whole collection of locale files should be installed. - LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ --$(rtld-prefix) $(common-objpfx)locale/localedef -+ localedef --no-archive - install-locales: $(INSTALL-SUPPORTED-LOCALES) - - install-locales-dir: -@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir - input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ - $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ - -i locales/$$input -f charmaps/$$charset \ -- $(addprefix --prefix=,$(install_root)) $$locale \ -+ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ - && echo ' done'; \ - - tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP |