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

This is a multi-part message in MIME format...

------------=_1785675515-4071053-7298
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

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

git pushed a commit to branch multilib
in repository lfs.

commit 84072a870aabd364a1e2e13ff14d32dfc4409f85
Merge: 5e8025610 8b989da79
Author: zeckma-tech <[email protected]>
AuthorDate: Sun Aug 2 06:58:20 2026 -0600

    Merge branch 'trunk' into multilib

 Makefile                |  2 +-
 chapter01/changelog.xml | 50 +++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  9 +++---
 chapter02/mounting.xml  |  5 ++++
 chapter03/patches.xml   |  3 +-
 chapter05/glibc.xml     |  6 ++--
 chapter06/gcc-pass2.xml | 16 ++++++++++
 chapter06/m4.xml        | 10 +++++++
 chapter08/binutils.xml  | 19 +++++++++++-
 chapter08/gcc.xml       |  9 ++----
 chapter08/glibc.xml     | 17 +++++++++--
 chapter08/pkgconf.xml   |  4 +++
 chapter08/shadow.xml    |  4 +++
 chapter08/sqlite.xml    |  3 +-
 chapter09/inputrc.xml   |  4 +++
 chapter10/grub.xml      | 15 +---------
 lfs-latest-git.php      |  6 +++-
 packages.ent            | 78 ++++++++++++++++++++++++-------------------------
 patches.ent             |  2 ++
 19 files changed, 185 insertions(+), 77 deletions(-)

diff --cc chapter06/gcc-pass2.xml
index 97ad58083,0d579311a..37e6e2522
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@@ -76,25 -73,25 +76,26 @@@ cd       build</userinput></screen
  
      <para>Now prepare GCC for compilation:</para>
  
 -<screen><userinput remap="configure">../configure                   \
 -    --build=$(../config.guess) \
 -    --host=$LFS_TGT            \
 -    --target=$LFS_TGT          \
 -    --prefix=/usr              \
 -    --with-build-sysroot=$LFS  \
 -    --enable-default-pie       \
 -    --enable-default-ssp       \
 -    --disable-fixincludes      \
 -    --disable-nls              \
 -    --disable-multilib         \
 -    --disable-libatomic        \
 -    --disable-libgomp          \
 -    --disable-libquadmath      \
 -    --disable-libsanitizer     \
 -    --disable-libssp           \
 -    --disable-libvtv           \
 -    --enable-languages=c,c++   \
 +<screen><userinput remap="configure">../configure                     \
 +    --build=$(../config.guess)   \
 +    --host=$LFS_TGT              \
 +    --target=$LFS_TGT            \
 +    --prefix=/usr                \
 +    --with-build-sysroot=$LFS    \
 +    --enable-default-pie         \
 +    --enable-default-ssp         \
 +    --disable-fixincludes        \
 +    --disable-nls                \
 +    --enable-multilib            \
 +    --with-multilib-list=m64,m32 \
 +    --disable-libatomic          \
 +    --disable-libgomp            \
 +    --disable-libquadmath        \
 +    --disable-libsanitizer       \
 +    --disable-libssp             \
 +    --disable-libvtv             \
 +    --enable-languages=c,c++     \
+     CXX_FOR_TARGET="$LFS_TGT-gcc -nostdinc++" \
      LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \
      target_configargs=gcc_cv_target_thread_file=posix</userinput></screen>
  
diff --cc chapter08/gcc.xml
index c0e842053,3c4f38193..c346142a2
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@@ -318,14 -316,21 +318,9 @@@ readelf -l a.out | grep ': /lib'</useri
    be ignored, but otherwise the output of the last command should be:</para>
  
  <screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
- SEARCH_DIR("/usr/local/lib64")
- SEARCH_DIR("/lib64")
- SEARCH_DIR("/usr/lib64")
- SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib")
- SEARCH_DIR("/usr/local/lib")
- SEARCH_DIR("/lib")
- SEARCH_DIR("/usr/lib");</computeroutput></screen>
+ SEARCH_DIR("/usr/lib");
+ SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib")</computeroutput></screen>
  
 -   <para>A 32-bit system may use a few other directories. For example, here
 -   is the output from an i686 machine:</para>
 -
 -<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
 -SEARCH_DIR("/usr/local/lib32")
 -SEARCH_DIR("/lib32")
 -SEARCH_DIR("/usr/lib32")
 -SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
 -SEARCH_DIR("/usr/local/lib")
 -SEARCH_DIR("/lib")
 -SEARCH_DIR("/usr/lib");</computeroutput></screen>
 -
    <para>Next make sure that we're using the correct libc:</para>
  
  <screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
diff --cc chapter10/grub.xml
index 27ed167ab,6ec526cf8..ac31dfe17
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@@ -288,19 -288,12 +288,12 @@@ insmod part_gp
  insmod ext2
  
  set root=(hd0,2)
- 
- # For UEFI
- insmod efi_gop
- insmod efi_uga
- 
  set gfxpayload=1024x768x32
  
 -menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
 -        linux   /boot/vmlinuz-&linux-version;-lfs-&version; root=/dev/sda2 ro
 +menuentry "GNU/Linux, Linux &linux-version;" {
 +        linux   /boot/vmlinuz-&linux-version; root=/dev/sda2 ro
  }</literal>
  EOF</userinput></screen>
- <!-- GOP is probably not needed anyhow, since we're not using terminal_output
-      gfxterm. -->
  
      <para>
        The <command>insmod</command> commands load the

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

------------=_1785675515-4071053-7298
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

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

------------=_1785675515-4071053-7298--