moved adjusting toolchain, bug #519, bug #537, and updated changelog

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

chapter01/changelog.xml

@@ -82,6 +82,16 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>August 17th, 2003 [alex]: Moved the adjusting of the toolchain
+from chapter 6 to the end of chapter 5.</para></listitem>
+
+<listitem><para>August 17th, 2003 [alex]: Chapter 05 - From Bash to Perl:
+put text in between commands. Added a section on stripping unneeded
+symbols to decrease the size of the tools.</para></listitem>
+
+<listitem><para>August 16th, 2003 [alex]: Chapter 05 - From Make to Texinfo:
+put text in between commands.</para></listitem>
+
 <listitem><para>August 11th, 2003 [alex]: Chapter 05 - From Binutils Pass 1 to
 Findutils: several small textual adjustments. For the second passes not giving
 the contents and dependencies.</para></listitem>

chapter05/chapter05.xml

@@ -35,6 +35,60 @@
 &c5-utillinux;
 &c5-perl;
 
+
+<sect1 id="ch05-adjustingtoolchain">
+<title>Re-adjusting the toolchain</title>
+<?dbhtml filename="adjustingtoolchain.html" dir="chapter05"?>
+
+<para>Now that we have compiled all the necessary tools, it is time to
+re-adjust our toolchain. We will set it up so that it will link any newly
+compiled program against the new Glibc, which is the first thing to get
+compiled in the next chapter. Basically, this is the reverse of what we did
+in the "Locking in" stage in the beginning of this chapter.</para>
+
+<para>The first thing to do is to adjust the linker scripts. For this we
+retained the <filename>binutils-build</filename> directory from the second
+pass over Binutils. Do the following:</para>
+
+<para><screen><userinput>cd binutils-build
+make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
+
+<para>This installs the adjusted linker scripts. The linker scripts now contain
+no mention of <filename>/stage1/lib</filename>. From now on every compiled
+program will link <emphasis>only</emphasis> against the libraries in
+<filename>/usr/lib</filename> and <filename>/lib</filename>. The extra
+<userinput>INSTALL=/stage1/bin/install</userinput> is needed because the
+Makefile created during the second pass still contains the reference to
+<filename>/usr/bin/install</filename>, which we obviously haven't installed
+yet.</para>
+
+<para>You can now remove the Binutils source and build directories.</para>
+
+<para>The next thing to do is to amend our GCC specs file so that it points to
+the new dynamic linker. Just like earlier on, we use a sed to accomplish
+this:</para>
+
+<para><screen><userinput>CURRENTSPECFILE=/stage1/lib/gcc-lib/*/*/specs
+sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;$CURRENTSPECFILE > newspecfile
+mv newspecfile $CURRENTSPECFILE
+unset CURRENTSPECFILE</userinput></screen></para>
+
+<para>Again, cutting and pasting the above is recommended. And just like
+before, it is a good idea to check the linker scripts and the specs file to
+ensure the intended changes were actually made.</para>
+
+<para>Note that the linker scripts will still contain a reference to
+<filename>/stage1/i686-pc-linux-gnu/lib</filename>. This is unavoidable, but
+luckily does not present a problem. There are no libraries in that location
+as all the temporary stage1 libraries are located in
+<filename>/stage1/lib</filename>.</para>
+
+</sect1>
+
+
+
 <sect1 id="ch05-stripping">
 <title>Stripping</title>
 <?dbhtml filename="stripping.html" dir="chapter05"?>

chapter05/creatingstage1dir.xml

@@ -19,8 +19,8 @@ partition:</para>
 
 <para>This symlink enables us to compile our toolchain so that it always
 refers to <filename>/stage1</filename>, meaning that the compiler, assembler
-and linker will work both in this chapter (when we are still rummaging around
+and linker will work both in this chapter (when we are still using some tools
-on the host) <emphasis>and</emphasis> in the next (when we are chrooted to
+from the host) <emphasis>and</emphasis> in the next (when we are chrooted to
 the LFS partition).</para>
 
 </sect1>

chapter05/ncurses-inst.xml

@@ -25,9 +25,5 @@ deprecated headers.</para>
 
 <para><screen><userinput>make install</userinput></screen></para>
 
-<para>And make some of the libraries executable:</para>
-
-<para><screen><userinput>chmod 755 /stage1/lib/*.5.3</userinput></screen></para>
-
 </sect2>
 

chapter06/chapter06.xml

@@ -14,7 +14,6 @@
 &c6-kernel;
 &c6-manpages;
 &c6-glibc;
-&c6-adjustingtoolchain;
 &c6-binutils;
 &c6-gcc;
 &c6-coreutils;

index.xml

@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20030806">
+<!ENTITY version "20030817">
-<!ENTITY releasedate "August 6th, 2003">
+<!ENTITY releasedate "August 17th, 2003">
 <!ENTITY nbsp " ">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">