~ruther/guix-local

463fb924525101dee8ccf5864bf62b8303f38d63 — Andreas Enge 5 months ago 140b6ab 
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
patch browse .tar.gz 
3 files changed, 1 insertions(+), 40 deletions(-)

M gnu/local.mk
M gnu/packages/base.scm
D gnu/packages/patches/glibc-locales-2.28.patch

M gnu/local.mk => gnu/local.mk +0 -1
@@ 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		\


M gnu/packages/base.scm => gnu/packages/base.scm +1 -8
@@ 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


D gnu/packages/patches/glibc-locales-2.28.patch => gnu/packages/patches/glibc-locales-2.28.patch +0 -31
@@ 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