git: a0b62311f278 - stable/15 - locale: Do not strip the suffix from CLDRVERSION
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 13 Jul 2026 12:35:07 UTC
The branch stable/15 has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=a0b62311f278bbe101c0163d4a14a5997d9f8b89
commit a0b62311f278bbe101c0163d4a14a5997d9f8b89
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-06-28 23:07:23 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-07-13 12:31:33 +0000
locale: Do not strip the suffix from CLDRVERSION
The upstream CLDR directory structure requires the full version string.
Remove the ':R' modifier to fix the fetch paths.
Previously this worked because major releases were published in a
directory without the ".0" suffix, while the filenames included it.
Starting with CLDR 47, the upstream layout changed to use the full
version string exclusively, causing the fetch URLs to break for point
releases.
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D57625
(cherry picked from commit 77ca1ce66283aa84258ef2323b692711df16158c)
---
tools/tools/locale/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile
index 24701af85199..69988ced09c8 100644
--- a/tools/tools/locale/Makefile
+++ b/tools/tools/locale/Makefile
@@ -122,9 +122,9 @@ ENCODINGS= UTF-8 \
UTF-32
# CLDR files
-CLDRFILES_CORE= https://unicode.org/Public/cldr/${CLDRVERSION:R}/core.zip
-CLDRFILES_KEY= https://unicode.org/Public/cldr/${CLDRVERSION:R}/cldr-keyboards-${CLDRVERSION}.zip
-CLDRFILES_TOOLS=https://unicode.org/Public/cldr/${CLDRVERSION:R}/cldr-tools-${CLDRVERSION}.jar
+CLDRFILES_CORE= https://unicode.org/Public/cldr/${CLDRVERSION}/core.zip
+CLDRFILES_KEY= https://unicode.org/Public/cldr/${CLDRVERSION}/cldr-keyboards-${CLDRVERSION}.zip
+CLDRFILES_TOOLS=https://unicode.org/Public/cldr/${CLDRVERSION}/cldr-tools-${CLDRVERSION}.jar
CLDRFILES_UCD= https://www.unicode.org/Public/${UCDVERSION}/ucd/UCD.zip
# fetch and extract targets