Date: Thu, 19 Aug 2021 17:38:49 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 298ee47e1988 - main - localedef: unbreak WITHOUT_LOCALES Message-ID: <202108191738.17JHcn3A030497@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=298ee47e1988a120249b24470c2c7c45f8c4359f commit 298ee47e1988a120249b24470c2c7c45f8c4359f Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2021-08-19 17:27:04 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108191738.17JHcn3A030497>