[lfs] 01/02: Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch xry111/loongarch
in repository lfs.

commit 52926f47fb6b734c9aca70a11175de86dec3bc98
Merge: 5160ba1fb 8d4ccb8a9
Author: Xi Ruoyao <[email protected]>
AuthorDate: Sun Aug 17 01:53:06 2025 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

 appendices/dependencies.xml |   5 +-
 chapter01/changelog.xml     |  41 ++++++++-
 chapter01/whatsnew.xml      |   4 +-
 chapter05/gcc-pass1.xml     |  17 ++++
 chapter06/gcc-pass2.xml     |  10 +-
 chapter08/glibc.xml         |  10 +-
 chapter08/tcl.xml           |   3 +-
 packages.ent                | 216 ++++++++++++++++++++++----------------------
 8 files changed, 185 insertions(+), 121 deletions(-)

diff --cc chapter05/gcc-pass1.xml
index 1ae75c712,3a537e014..fd1b0b6dc
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@@ -62,12 -62,33 +62,29 @@@ mv -v gmp-&gmp-version; gm
  tar -xf ../mpc-&mpc-version;.tar.gz
  mv -v mpc-&mpc-version; mpc</userinput></screen>
  
 -    <para>On x86_64 hosts, set the default directory name for
 +    <para>Set the default directory name for
      64-bit libraries to <quote>lib</quote>:</para>
  
 -<screen><userinput remap="pre">case $(uname -m) in
 -  x86_64)
 -    sed -e '/m64=/s/lib64/lib/' \
 -        -i.orig gcc/config/i386/t-linux64
 - ;;
 -esac</userinput></screen>
 +<screen><userinput remap="pre">sed -e 's/lib64/lib/' \
 +    -i.orig gcc/config/loongarch/{t-linux,linux.h}</userinput></screen>
  
+     <note>
+       <para>
+         This example demonstrates the use of the
+         <parameter>-i.orig</parameter> switch.  It makes the
+         <command>sed</command> copy the <filename>t-linux64</filename>
+         to <filename>t-linux64.orig</filename>, and then edit the
+         <filename>t-linux64</filename> inplace.  So you may run
+         <command>diff -u gcc/config/i386/t-linux64{.orig,}</command>
+         to visualize the change done by the <command>sed</command> command
+         afterwards.  We'll simply use <parameter>-i</parameter> (which just
+         edits the original file inplace without copying it) for all other
+         packages in the book, but you can change it to
+         <parameter>-i.orig</parameter> in any case you want to keep a copy
+         of the original file.
+       </para>
+     </note>
+ 
      <para>The GCC documentation recommends building GCC
      in a dedicated build directory:</para>
  
diff --cc chapter06/gcc-pass2.xml
index 3afd90f45,d02ff5457..f4d20b35a
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -53,13 -53,17 +53,13 @@@ mv -v gmp-&gmp-version; gm
  tar -xf ../mpc-&mpc-version;.tar.gz
  mv -v mpc-&mpc-version; mpc</userinput></screen>
  
 -    <para>If you are building on x86_64, change the default directory name for
 +    <para>Set the default directory name for
      64-bit libraries to <quote>lib</quote>:</para>
  
 -<screen><userinput remap="pre">case $(uname -m) in
 -  x86_64)
 -    sed -e '/m64=/s/lib64/lib/' \
 -        -i.orig gcc/config/i386/t-linux64
 -  ;;
 -esac</userinput></screen>
 +<screen><userinput remap="pre">sed -e 's/lib64/lib/' \
 +    -i.orig gcc/config/loongarch/{t-linux,linux.h}</userinput></screen>
  
-     <para>Override the building rule of libgcc and libstdc++ headers, to
+     <para>Override the build rules of the libgcc and libstdc++ headers to
      allow building these libraries with POSIX threads support:</para>
  
  <screen><userinput remap="pre">sed '/thread_header =/s/@.*@/gthr-posix.h/' \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page