unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Mathieu Othacehe <m.othacehe@gmail.com>
To: 33186@debbugs.gnu.org
Subject: [bug#33186] [PATCH 4/7] gnu: glibc: Export supported locales.
Date: Sun, 28 Oct 2018 21:40:40 +0900	[thread overview]
Message-ID: <20181028124043.21773-5-m.othacehe@gmail.com> (raw)
In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com>

Debian and Archlinux (at least) force the installation of the
localedata/SUPPORTED file of the glibc. This file lists all the supported
locales of the glibc.

* gnu/packages/patches/glibc-supported-locales.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/base.scm (glibc/linux): Add the previous patch,
(glibc-2.28): ditto.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/base.scm                         |  6 ++--
 .../patches/glibc-supported-locales.patch     | 31 +++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/glibc-supported-locales.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 56c434d0a..0828f4358 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -754,6 +754,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glibc-vectorized-strcspn-guards.patch	\
   %D%/packages/patches/glibc-versioned-locpath.patch		\
   %D%/packages/patches/glibc-2.27-git-fixes.patch		\
+  %D%/packages/patches/glibc-supported-locales.patch     	\
   %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch		\
   %D%/packages/patches/glog-gcc-5-demangling.patch		\
   %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4065af0ab..d278b36a5 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -594,7 +594,8 @@ store.")
                                      "glibc-hidden-visibility-ldconfig.patch"
                                      "glibc-versioned-locpath.patch"
                                      "glibc-allow-kernel-2.6.32.patch"
-                                     "glibc-reinstate-prlimit64-fallback.patch"))))
+                                     "glibc-reinstate-prlimit64-fallback.patch"
+                                     "glibc-supported-locales.patch"))))
    (build-system gnu-build-system)
 
    ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc
@@ -888,7 +889,8 @@ GLIBC/HURD for a Hurd host"
               (patches (search-patches "glibc-allow-kernel-2.6.32.patch"
                                        "glibc-ldd-x86_64.patch"
                                        "glibc-hidden-visibility-ldconfig.patch"
-                                       "glibc-versioned-locpath.patch"))))))
+                                       "glibc-versioned-locpath.patch"
+                                       "glibc-supported-locales.patch"))))))
 
 ;; Below are old libc versions, which we use mostly to build locale data in
 ;; the old format (which the new libc cannot cope with.)
diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch
new file mode 100644
index 000000000..f1c8a8887
--- /dev/null
+++ b/gnu/packages/patches/glibc-supported-locales.patch
@@ -0,0 +1,31 @@
+This patch is taken from debian's glibc package (generate-supported.mk).
+
+diff --git a/localedata/Makefile.old b/localedata/Makefile
+index 34877c0..a61d9b9 100644
+--- a/localedata/Makefile.old
++++ b/localedata/Makefile
+@@ -91,7 +91,8 @@ endif
+ # Files to install.
+ install-others := $(addprefix $(inst_i18ndir)/, \
+ 			      $(addsuffix .gz, $(charmaps)) \
+-			      $(locales))
++			      $(locales)) \
++                   $(inst_i18ndir)/SUPPORTED
+ 
+ tests: $(objdir)/iconvdata/gconv-modules
+ 
+@@ -195,6 +196,14 @@ endif
+ 
+ include SUPPORTED
+ 
++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force)
++	for locale in $(SUPPORTED-LOCALES); do \
++		[ $$locale = true ] && continue; \
++		echo $$locale | sed 's,/, ,' >> LOCALES; \
++	done
++	$(make-target-directory)
++	$(INSTALL_DATA) LOCALES $@
++
+ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
+ 
+ # Sometimes the whole collection of locale files should be installed.
-- 
2.17.1

  parent reply	other threads:[~2018-10-28 12:42 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-28 12:35 [bug#33186] [PATCH 0/7] Preliminary installer work Mathieu Othacehe
2018-10-28 12:40 ` [bug#33186] [PATCH 1/7] gnu: Add guile-newt Mathieu Othacehe
2018-10-28 12:40   ` [bug#33186] [PATCH 2/7] services: kmscon: Do not switch to vt at start Mathieu Othacehe
2018-11-06 15:35     ` Ludovic Courtès
2018-11-07  9:17       ` Mathieu Othacehe
2018-10-28 12:40   ` [bug#33186] [PATCH 3/7] services: kmscon: Add an auto-login option Mathieu Othacehe
2018-11-06 15:36     ` Ludovic Courtès
2018-11-07  9:23       ` Mathieu Othacehe
2018-10-28 12:40   ` Mathieu Othacehe [this message]
2018-11-06 15:37     ` [bug#33186] [PATCH 4/7] gnu: glibc: Export supported locales Ludovic Courtès
2018-11-07  9:49       ` Mathieu Othacehe
2018-10-28 12:40   ` [bug#33186] [PATCH 5/7] gnu: terminals: Change libtsm and kmscon repositories Mathieu Othacehe
2018-11-06 15:38     ` Ludovic Courtès
2018-11-07  9:27       ` Mathieu Othacehe
2018-10-28 12:40   ` [bug#33186] [PATCH 6/7] gnu: slang: Use a correct location for terminfo dirs Mathieu Othacehe
2018-11-06 15:40     ` Ludovic Courtès
2018-11-07  9:39       ` Mathieu Othacehe
2018-10-28 12:40   ` [bug#33186] [PATCH 7/7] gnu: python-3.6: Disable congestion test Mathieu Othacehe
2018-11-06 15:43     ` Ludovic Courtès
2018-11-06 15:59       ` Marius Bakke
2018-11-06 16:29         ` Gábor Boskovits
2018-11-27 10:27         ` bug#33186: " Ludovic Courtès
2018-11-06 15:34   ` [bug#33186] [PATCH 1/7] gnu: Add guile-newt Ludovic Courtès
2018-11-07  9:12     ` Mathieu Othacehe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181028124043.21773-5-m.othacehe@gmail.com \
    --to=m.othacehe@gmail.com \
    --cc=33186@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).