[lfs] 07/09: Merge remote-tracking branch 'origin/trunk' into xry111/mips64el

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

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

commit 63e0975fda72ece1a4560bc378ce03c4e820f015
Merge: eee77302b f02fb1054
Author: Xi Ruoyao <[email protected]>
AuthorDate: Mon Aug 18 15:47:20 2025 +0800

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

 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         |  12 ++-
 chapter08/tcl.xml           |   3 +-
 packages.ent                | 216 ++++++++++++++++++++++----------------------
 8 files changed, 186 insertions(+), 122 deletions(-)

diff --cc chapter05/gcc-pass1.xml
index 11c9e47c8,a5aa62e45..ba407daa9
--- 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>On 64-bit MIPS hosts, 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/mips/{mips.h,t-linux64}</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> file
+         to <filename>t-linux64.orig</filename>, and then edit the original
+         <filename>t-linux64</filename> file 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 c12491133,d02ff5457..6ef3d7c8b
--- 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>For building on 64-bit MIPS, change 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/mips/{mips.h,t-linux64}</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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.