aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Trepl <thomas@linuxfromscratch.org>2024-01-10 00:30:10 +0100
committerThomas Trepl <thomas@linuxfromscratch.org>2024-01-10 00:30:10 +0100
commit89273dcaa96f747befde1e7c4751c1807745e2fc (patch)
treeb0a69f68892f2f542c5a17556457c43a8b286a13
parentb932c7ae89a0b258b1a02dc0ee4f57724ea8619e (diff)
parentfecc2872806aff96bb4eeaa6738205725881574c (diff)
Automatic merge of trunk into multilib
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter08/glibc.xml2
2 files changed, 11 insertions, 1 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ae58b466f..7cb92aa4a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,16 @@
-->
<listitem>
+ <para>2024-01-09</para>
+ <itemizedlist>
+ <listitem>
+ <para>[renodr] - Fix the definition of the C.UTF-8 locale. Fixes
+ <ulink url="&lfs-ticket-root;5409">#5409</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2023-12-31</para>
<itemizedlist>
<listitem>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index bd0c9f8e1..d76b83047 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -304,7 +304,7 @@ localedef -i zh_TW -f UTF-8 zh_TW.UTF-8</userinput></screen>
when you need them. For instance, the following two locales are
needed for some tests later in this chapter:</para>
-<screen role="nodump"><userinput remap="locale-full">localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
+<screen role="nodump"><userinput remap="locale-full">localedef -i C -f UTF-8 C.UTF-8
localedef -i ja_JP -f SHIFT_JIS ja_JP.SJIS 2> /dev/null || true</userinput></screen>
<note><para>Glibc now uses libidn2 when resolving internationalized