[lfs] 01/01: 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 3463ee37df03461d3de57670eac359021809da35
Merge: f186938ff 118c93154
Author: Zeckmathederg <[email protected]>
AuthorDate: Mon May 11 17:05:20 2026 -0600

    Merge branch 'trunk' into multilib

 chapter01/changelog.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++
 chapter01/how.xml       |  6 ++---
 chapter02/hostreqs.xml  | 34 ++++++++++++++++++++++++-----
 chapter03/patches.xml   | 12 +++++-----
 chapter05/gcc-pass1.xml | 13 ++---------
 chapter05/glibc.xml     |  4 ++++
 chapter08/gcc.xml       | 57 ++++++++++++++++++++++++++++--------------------
 chapter08/glibc.xml     | 15 +++++--------
 chapter08/python.xml    |  2 +-
 chapter08/systemd.xml   |  7 ++++++
 lfs-latest-git.php      |  5 ++++-
 packages.ent            | 58 +++++++++++++++++++++++--------------------------
 patches.ent             | 22 ++++++++-----------
 13 files changed, 182 insertions(+), 105 deletions(-)

diff --cc chapter08/gcc.xml
index 9a68fd425,6c40e9745..5e63fbadd
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@@ -41,22 -41,20 +41,24 @@@
    <sect2 role="installation">
      <title>Installation of GCC</title>
  
 -    <!-- not needed anymore with gcc-16:
++<!--
      <para>First, make a fix required by glibc-2.43 and later:</para>
  
--    <screen><userinput remap="pre">sed -i 's/char [*]q/const &amp;/' libgomp/affinity-fmt.c</userinput></screen>
 -    -->
 -    <para>If building on x86_64, change the default directory name for 64-bit
++<screen><userinput remap="pre">sed -i 's/char [*]q/const &amp;/' libgomp/affinity-fmt.c</userinput></screen>
++-->
 +
 +    <para>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 '/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>The GCC documentation recommends building GCC in a dedicated build directory:</para>
  
diff --cc packages.ent
index 699a6d043,365c10197..8be9aa6b2
--- a/packages.ent
+++ b/packages.ent
@@@ -554,18 -540,10 +550,18 @@@
  <!ENTITY ninja-fin-du "43 MB">
  <!ENTITY ninja-fin-sbu "0.2 SBU">
  
 +<!ENTITY openrc-version "0.63">
 +<!ENTITY openrc-size "260 KB">
 +<!ENTITY openrc-url "&github;/OpenRC/openrc/archive/&openrc-version;/openrc-&openrc-version;.tar.gz">
 +<!ENTITY openrc-md5 "f73566fc120e19e5a96fb0134cbb5ac8">
 +<!ENTITY openrc-home "https://wiki.gentoo.org/wiki/OpenRC">
 +<!ENTITY openrc-fin-du "13 MB">
 +<!ENTITY openrc-fin-sbu "0.1 SBU">
 +
- <!ENTITY openssl-version "3.6.2">
- <!ENTITY openssl-size "53,627 KB">
+ <!ENTITY openssl-version "4.0.0">
+ <!ENTITY openssl-size "53,757 KB">
  <!ENTITY openssl-url "&github;/openssl/openssl/releases/download/openssl-&openssl-version;/openssl-&openssl-version;.tar.gz">
- <!ENTITY openssl-md5 "f27e8f53ac612bb0e3e781a45799fb90">
+ <!ENTITY openssl-md5 "f26714e6398a2d921fc5616daaa75231">
  <!ENTITY openssl-home "https://www.openssl-library.org/">
  <!ENTITY openssl-fin-du "981 MB">
  <!ENTITY openssl-fin-sbu "1.9 SBU">

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