From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EF8713835B for ; Tue, 12 May 2020 04:23:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81F36E08F7; Tue, 12 May 2020 04:23:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B6ACE08F7 for ; Tue, 12 May 2020 04:23:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6196834FE43 for ; Tue, 12 May 2020 04:23:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1A99214 for ; Tue, 12 May 2020 04:23:03 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1589256519.e384fae0f4cafe49304afbc872cb7d3422903681.dilfridge@gentoo> Subject: [gentoo-commits] proj/locale-gen:master commit in: / X-VCS-Repository: proj/locale-gen X-VCS-Files: locale-gen X-VCS-Directories: / X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: e384fae0f4cafe49304afbc872cb7d3422903681 X-VCS-Branch: master Date: Tue, 12 May 2020 04:23:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d30f7108-550f-4f28-ab1d-9701718be840 X-Archives-Hash: 506e39fb5b032a17bbd55cbdf326559e commit: e384fae0f4cafe49304afbc872cb7d3422903681 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Dec 14 19:43:04 2018 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue May 12 04:08:39 2020 +0000 URL: https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=e384fae0 locale-gen: Always build the C.UTF-8 locale (which we now patch in) Originally f2ed15510fd0f7b9bcc923e24efd2681aacd0d5f, gentoo/glibc-9999-9 Signed-off-by: Andreas K. Hüttel gentoo.org> locale-gen | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/locale-gen b/locale-gen index fc861f4..f88c677 100755 --- a/locale-gen +++ b/locale-gen @@ -181,6 +181,10 @@ if [[ -z ${locales_to_generate} ]] && [[ -e ${CONFIG} ]] ; then ewarn "Some might be filtered, but you must fix it." locales_to_generate=$(echo "${locales_to_generate}" | uniq) fi + + if echo ${locales_to_generate} | grep -vq 'C.UTF-8' ; then + locales_to_generate=$(echo "${locales_to_generate}" ; echo "C.UTF-8 UTF-8") + fi fi if [[ -z ${locales_to_generate} ]] ; then @@ -339,7 +343,7 @@ ret=$(( 0 ${JOB_RETS[@]/#/+} )) [[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \ einfo "Generation complete" -if ${LOCALE_ARCHIVE} ; then +if ${LOCALE_ARCHIVE} && [[ -z ${JUST_LIST} ]] ; then ebegin "Adding locales to archive" # The pattern ends with / on purpose: we don't care about files (like # locale-archive) in the locale subdir, and we definitely don't want to @@ -367,7 +371,7 @@ if ${LOCALE_ARCHIVE} ; then fi # Remove locales that existed but were not requested -if [[ -n ${UPDATE} ]] ; then +if [[ -n ${UPDATE} ]] && [[ -z ${JUST_LIST} ]] ; then # Ignore these pseudo locales existing_locales=${existing_locales/ C / } existing_locales=${existing_locales/ POSIX / }