From owner-dev-commits-src-all@freebsd.org Fri Jul 23 15:07:00 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F11C5674103; Fri, 23 Jul 2021 15:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GWXjJ5Trgz545J; Fri, 23 Jul 2021 15:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FA4126D7F; Fri, 23 Jul 2021 15:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16NF70VW044277; Fri, 23 Jul 2021 15:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16NF7073044276; Fri, 23 Jul 2021 15:07:00 GMT (envelope-from git) Date: Fri, 23 Jul 2021 15:07:00 GMT Message-Id: <202107231507.16NF7073044276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ecff3c30b7e4 - main - locales: now that C.UTF-8 is the default locale, always install it MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecff3c30b7e4ed8883c007b019f90a8128d16441 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2021 15:07:01 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ecff3c30b7e4ed8883c007b019f90a8128d16441 commit ecff3c30b7e4ed8883c007b019f90a8128d16441 Author: Baptiste Daroussin AuthorDate: 2021-07-23 12:15:04 +0000 Commit: Baptiste Daroussin CommitDate: 2021-07-23 14:58:20 +0000 locales: now that C.UTF-8 is the default locale, always install it MFC after: 3 weeks --- share/Makefile | 3 +-- share/ctypedef/Makefile | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/Makefile b/share/Makefile index dfa5ff1a65a2..5d81f3229760 100644 --- a/share/Makefile +++ b/share/Makefile @@ -6,7 +6,7 @@ # Do not include `info' in the SUBDIR list, it is handled separately. SUBDIR= ${_colldef} \ - ${_ctypedef} \ + ctypedef \ ${_dict} \ ${_doc} \ ${_dtrace} \ @@ -55,7 +55,6 @@ _i18n= i18n .if ${MK_LOCALES} != "no" _colldef= colldef colldef_unicode _monetdef= monetdef monetdef_unicode -_ctypedef= ctypedef _msgdef= msgdef msgdef_unicode _numericdef= numericdef numericdef_unicode _timedef= timedef diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 89d7e674a39e..4272b4de4f50 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -6,6 +6,7 @@ FILESNAME= LC_CTYPE MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps .include +.include .src.LC_CTYPE: localedef ${LOCALEDEF_ENDIAN} -D -U -c -w ${MAPLOC}/widths.txt \ @@ -13,6 +14,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps -i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} || true LOCALES+= C.UTF-8 +.if ${MK_LOCALES} != no LOCALES+= be_BY.CP1131 LOCALES+= ca_IT.ISO8859-1 LOCALES+= ca_IT.ISO8859-15 @@ -206,6 +208,7 @@ SAME+= en_US.US-ASCII en_CA.US-ASCII SAME+= en_US.US-ASCII en_AU.US-ASCII SAME+= lv_LV.ISO8859-13 lt_LT.ISO8859-13 SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) +.endif FILES= ${LOCALES:S/$/.LC_CTYPE/} CLEANFILES= ${FILES}