From 4ed2d581049d2d4fdc46caec9caa997cef0c33ea Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 13 Mar 2024 07:12:56 -0400 Subject: [PATCH] glibc: restore buildability in musl masterdirs It's generally unsupported, but glibc builds fine in a musl masterdir, so we might as well check if localedef is available when building the C.UTF-8 locale and proceed with a warning if not. --- srcpkgs/glibc/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 6faee3db813..cf30cd88dd6 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -136,7 +136,7 @@ do_install() { if [ -z "${CROSS_BUILD}" ]; then make -C localedata DESTDIR="${DESTDIR}" \ objdir="../build" install-files-C.UTF-8/UTF-8 - else + elif command -v localedef >/dev/null 2>&1; then local endian= case "$XBPS_TARGET_ENDIAN" in be) endian="--big-endian" ;; @@ -146,6 +146,8 @@ do_install() { vmkdir usr/lib/locale I18NPATH=./localedata localedef --prefix="${DESTDIR}" ${endian} \ -i C -f UTF-8 --no-archive "${DESTDIR}/usr/lib/locale/C.utf8" + else + msg_warn "localedef not available; skipping generation of C.UTF-8 locale\n" fi # create /etc/default/libc-locales