From patchwork Sun Oct 28 12:40:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 48 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AAA4C16754; Sun, 28 Oct 2018 12:44:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 4E41D16750 for ; Sun, 28 Oct 2018 12:44:45 +0000 (GMT) Received: from localhost ([::1]:40027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkQu-0002uK-Lx for patchwork@mira.cbaines.net; Sun, 28 Oct 2018 08:44:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gGkOO-0008Uj-1w for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gGkOJ-0004Xn-33 for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gGkOI-0004Xd-V1 for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gGkOI-0007NJ-RU for guix-patches@gnu.org; Sun, 28 Oct 2018 08:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33186] [PATCH 4/7] gnu: glibc: Export supported locales. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Oct 2018 12:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33186@debbugs.gnu.org Received: via spool by 33186-submit@debbugs.gnu.org id=B33186.154073047528238 (code B ref 33186); Sun, 28 Oct 2018 12:42:02 +0000 Received: (at 33186) by debbugs.gnu.org; 28 Oct 2018 12:41:15 +0000 Received: from localhost ([127.0.0.1]:46782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNW-0007LN-LT for submit@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:14 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:38624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gGkNU-0007Ki-Tt for 33186@debbugs.gnu.org; Sun, 28 Oct 2018 08:41:13 -0400 Received: by mail-pl1-f195.google.com with SMTP id p7-v6so2516254plk.5 for <33186@debbugs.gnu.org>; Sun, 28 Oct 2018 05:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2kBI6kxnOkPNh33n0r6obMDWStD6NWxzpP93dKqzNPI=; b=XWn8KJmwATsYyL6hy3lb1X2C9Is5oJtY/KU3dBEDCZUDMumKG8QzVhtovHPGDeoCky lyozueGenww3QSgYaLAA258qsvKCzXK4e7Hk4XgMbj+26P1U4RK/ulU62Dk/4kHuKHE7 tUnl8wXP/nYF7OKyIJKeiov6rh0v0NNj2GgV5sjA5arvC2I5PSnhSfMwhzpeEu9faVuM 5izyHgDVedbMjy5s3I88U3qcqbuMyTNmucS5sJm+MKi1miP5Tnp75HhLFvfifFRpIYZV oFQ9W9BjeOKS2vDYwgAh3bfzzRSM5lZ6QWYrBpcxw9LTVC4bqXIAjM2uMC8LMo81dbAh 181Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2kBI6kxnOkPNh33n0r6obMDWStD6NWxzpP93dKqzNPI=; b=p1wZcJuNRQezugLmXHXRmS3k1heNC1ksXne/+Ps4Bwc/97jwtIKVeIKrPagup6DtwK nY1aTIw1U3IYaEKBRNqJvwF4JOMQ1B3nci/08kKR+PDV+hr3pFLlyS0TVQI+0iEdxTbE HqWs7A/h/ZnYsHZhMmT1tTsHXqNTRsuHvJzJX3ZEsPRalNS2rSwcQLEhhPDugJIGzkxH uDneXdEFULR/sd3fZTWEzTkOLnlhVJvv2JSldHA75D0NvRglE1LtU7ExX4JFL0JZQlXD 183ocedFXoV+PdkKOIg/p03Jbv4V2aZGl7OUfti69tyubs4SllT8r9fS/BREEupqBKA4 Dofg== X-Gm-Message-State: AGRZ1gLH0uXGCCIiI3KjMLF7uE/+lLzF/dWCVMPArh1HRE60oJSg4j6D oSgKagjjtvcWOWGnA0nvSVuyE/8N X-Google-Smtp-Source: AJdET5c3lVaOcmpdZEdPdubutwssIoxdrCuoyprFpOo5NHwG4tW8MVz7B5YdK6C7SZwoaF+u4dUTxw== X-Received: by 2002:a17:902:25ab:: with SMTP id y40-v6mr6699307pla.327.1540730467060; Sun, 28 Oct 2018 05:41:07 -0700 (PDT) Received: from localhost.localdomain (p506075-ipngn200505niho.hiroshima.ocn.ne.jp. [180.49.233.75]) by smtp.gmail.com with ESMTPSA id c69-v6sm33201759pfg.2.2018.10.28.05.41.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 05:41:06 -0700 (PDT) From: Mathieu Othacehe Date: Sun, 28 Oct 2018 21:40:40 +0900 Message-Id: <20181028124043.21773-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181028124043.21773-2-m.othacehe@gmail.com> References: <20181028124043.21773-2-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 refers to , 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.