Changeset be2dd91 for chapter05

Timestamp:

08/31/2003 09:45:06 PM (21 years ago)

Author:

Jeremy Utley <jeremy@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v5_0, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

e667f58

Parents:

09c1e75

Message:

Simplified the glibc-lockin for chapter 5, and added some verbiage on fixincludes

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2708 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter05

Files:

• gcc-pass2-inst.xml (modified) (1 diff)
• lockingglibc.xml (modified) (1 diff)

chapter05/gcc-pass2-inst.xml

@@ -12 +12 @@
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-2.patch
 patch -Np1 -i ../gcc-&gcc-specs-version;.patch</userinput></screen></para>
+
+<para>The first patch disables the GCC "fixincludes" script.  We mentioned this
+briefly earlier, but a slightly more in-depth explanation of the fixincludes 
+process is warranted here.  Under normal circumstances, the GCC fixincludes
+script scans your system for header files that need to be fixed.  It might find
+that the Glibc header files on your host system need to be fixed, fix them and
+put them in the GCC private include directory.  Then, later on in Chapter 6,
+after we've installed the newer Glibc, this private include directory would be
+searched before the system include directory, resulting in GCC finding the
+fixed headers from the host system, which would most likely not match the Glibc
+version actually used for the LFS system.</para>
 
 <para>The last patch changes GCC's default location of the dynamic linker,

chapter05/lockingglibc.xml

@@ -36 +36 @@
 "/lib/ld-linux.so.2" with "/stage1/lib/ld-linux.so.2".</para>
 
-<para>Also, because we allowed GCC's "Fixincludes" script to modify our host's
-header files (and this was necessary because of improper use of the __thread
-keyword in some older software), we want to get rid of those modified header
-files, and replace them with pristine ones.</para>
+<para>Lastly, there is a possibility that some include files from the host
+system have found their way into gcc's private include dir. This can happen
+because of GCC's "fixincludes" process which part of the GCC build. We'll
+explain more about this further on in this chapter.  For now, run the
+following commands to eliminate this possibility.</para>
 
-<para><screen><userinput>GCCDIR=/stage1/lib/gcc-lib/*/*
-rm -rf $GCCDIR/include/*
-cp $GCCDIR/install-tools/include/* $GCCDIR/include
-cp $GCCDIR/install-tools/gsyslimits.h \
-   $GCCDIR/include/syslimits.h
-unset GCCDIR</userinput></screen></para>
+<para><screen><userinput>rm -f /stage1/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen></para>
 
 <para>This completes the installation of the self-contained toolchain, which