From owner-dev-commits-src-all@freebsd.org Thu Aug 19 17:38:49 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 5BE66668E26; Thu, 19 Aug 2021 17:38:49 +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 4GrBp11rzlz3JcM; Thu, 19 Aug 2021 17:38:49 +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 2787C1B9E; Thu, 19 Aug 2021 17:38:49 +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 17JHcnCQ030498; Thu, 19 Aug 2021 17:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17JHcn3A030497; Thu, 19 Aug 2021 17:38:49 GMT (envelope-from git) Date: Thu, 19 Aug 2021 17:38:49 GMT Message-Id: <202108191738.17JHcn3A030497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 298ee47e1988 - main - localedef: unbreak WITHOUT_LOCALES MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 298ee47e1988a120249b24470c2c7c45f8c4359f 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: Thu, 19 Aug 2021 17:38:49 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=298ee47e1988a120249b24470c2c7c45f8c4359f commit 298ee47e1988a120249b24470c2c7c45f8c4359f Author: Bjoern A. Zeeb AuthorDate: 2021-08-19 17:27:04 +0000 Commit: Kyle Evans CommitDate: 2021-08-19 17:38:17 +0000 localedef: unbreak WITHOUT_LOCALES After 0fa5403d493b ("pkgbase: move locales into their own package") we need usr.bin/localedef as a bootstrap tool independent on where WITHOUT_LOCALE was specified as we ALWAYS process C.UTF-8. At the same time LOCALES= in the local Makefile is empty but C.UTF-8 with WITHOUT_LOCALES. C.UTF-8 is excluded from FILES, and thus after the replacement FILES= is set to only .LC_CTYPE which results in a build failure not knowing how to build that. Tweak the substitution to replace only non-empty words so that FILES remains harmlessly empty. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D31589 --- Makefile.inc1 | 3 +-- share/ctypedef/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index eb69d660cede..5bb2412e4042 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2353,10 +2353,9 @@ ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal ${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal .endif -.if ${MK_LOCALES} != "no" +# C.UTF-8 is always built in share/ctypes and we need localedef for that. _localedef= usr.bin/localedef ${_bt}-usr.bin/localedef: ${_bt}-usr.bin/yacc ${_bt_lex_depend} -.endif .if ${MK_ICONV} != "no" _mkesdb= usr.bin/mkesdb diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 798576f7ad08..d8b00bfb8acc 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -218,7 +218,7 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset) # C.UTF-8 is the default locale, so it should always been installed. ALWAYS= C.UTF-8.LC_CTYPE -FILES= ${LOCALES:NC.UTF-8:S/$/.LC_CTYPE/} +FILES= ${LOCALES:NC.UTF-8:C/.+$/&.LC_CTYPE/} CLEANFILES= ${FILES} .for f t in ${SAME}