[lfs] 01/02: Merge branch 'trunk' into multilib

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

git pushed a commit to branch multilib
in repository lfs.

commit fed2dff94b9ded5f3f381b091b99be352152ef6d
Merge: 49508e746 801cae57e
Author: Zeckmathederg <[email protected]>
AuthorDate: Wed Apr 1 13:17:31 2026 -0600

    Merge branch 'trunk' into multilib

 chapter01/changelog.xml | 50 +++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 16 +++++------
 chapter05/gcc-pass1.xml |  2 +-
 chapter06/gcc-pass2.xml |  2 +-
 chapter08/gcc.xml       |  4 +++
 chapter08/groff.xml     |  2 ++
 chapter08/inetutils.xml |  7 +++--
 chapter08/python.xml    |  7 +++++
 chapter08/vim.xml       |  4 +--
 packages.ent            | 74 ++++++++++++++++++++++++-------------------------
 10 files changed, 116 insertions(+), 52 deletions(-)

diff --cc chapter05/gcc-pass1.xml
index fa9f505f8,8da5617ed..47ab9dcbd
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@@ -59,16 -59,18 +59,16 @@@
  mv -v mpfr-&mpfr-version; mpfr
  tar -xf ../gmp-&gmp-version;.tar.xz
  mv -v gmp-&gmp-version; gmp
- tar -xf ../mpc-&mpc-version;.tar.gz
+ tar -xf ../mpc-&mpc-version;.tar.xz
  mv -v mpc-&mpc-version; mpc</userinput></screen>
  
 -    <para>On x86_64 hosts, set the default directory name for
 -    64-bit libraries to <quote>lib</quote>:</para>
 +    <para>Change the default directory name for
 +    libraries:</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 '/m64=/s/lib64/lib/' \
 +    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
 +    -i.orig gcc/config/i386/t-linux64
 +</userinput></screen>
  
      <note>
        <para>
diff --cc chapter06/gcc-pass2.xml
index 0d9fa7afd,89b2bc33e..b74096698
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -50,22 -50,18 +50,22 @@@
  mv -v mpfr-&mpfr-version; mpfr
  tar -xf ../gmp-&gmp-version;.tar.xz
  mv -v gmp-&gmp-version; gmp
- tar -xf ../mpc-&mpc-version;.tar.gz
+ tar -xf ../mpc-&mpc-version;.tar.xz
  mv -v mpc-&mpc-version; mpc</userinput></screen>
  
 -    <para>If you are building on x86_64, 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>
 +    <para>Change the default directory name for the
 +    libraries:</para>
 +
 +<screen><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
 +    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
 +    -i.orig gcc/config/i386/t-linux64</userinput></screen>
 +
 +    <para>Make <literal>-mstackrealign</literal> a default for 32-bit
 +      objects:</para>
 +
 +<screen><userinput remap="pre">sed '/STACK_REALIGN_DEFAULT/s/0/(!TARGET_64BIT \&amp;\&amp; TARGET_SSE)/' \
 +      -i gcc/config/i386/i386.h</userinput></screen>
  
      <para>Override the build rules of the libgcc and libstdc++ headers to
      allow building these libraries with POSIX threads support:</para>

-- 
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