Merging caption and installation sections for all packages in chapters 5 and 6.

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

1 files changed, 68 insertions, 1 deletions

diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 3e9827b5f..adcd0c16b 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -5,7 +5,74 @@
 <screen>Estimated build time:           &binutils-time-tools-pass2;
 Estimated required disk space:  &binutils-compsize-tools-pass2;</screen>
 
-&c5-binutils-pass2-inst;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Re-installation of Binutils</title>
+
+<para>Create a separate build directory again:</para>
+
+<screen><userinput>mkdir ../binutils-build
+cd ../binutils-build</userinput></screen>
+
+<para>Now prepare Binutils to be compiled:</para>
+
+<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --with-lib-path=/tools/lib</userinput></screen>
+
+<para>The meaning of the new configure option:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--with-lib-path=/tools/lib</userinput>: This tells
+the configure script to specify the default library search path. We don't want
+the library search path to contain library directories from the host
+system.</para></listitem>
+</itemizedlist>
+
+<para>Before starting to build Binutils, remember to unset any environment
+variables that override the default optimization flags.</para>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make </userinput></screen>
+
+<note><para>It's worth pointing out that running the Binutils test suite here
+is considered not as important as running it in
+<xref linkend="chapter06"/>.</para></note>
+
+<para>Test the results (there should be no unexpected failures here, expected
+failures are fine):</para>
+
+<screen><userinput>make check</userinput></screen>
+
+<para>Unfortunately, there is no easy way to view the test results summary like
+there was for the previous GCC package. However, if a failure occurs here, it
+should be easy to spot. The output shown will contain something like:</para>
+
+<blockquote><screen>make[1]: *** [check-binutils] Error 2</screen></blockquote>
+
+<para>And install the package:</para>                                              
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Now prepare Binutils for the re-adjusting of the toolchain in the next
+chapter:</para>
+
+<screen><userinput>make -C ld clean
+make -C ld LIB_PATH=/usr/lib:/lib</userinput></screen>
+
+<!-- HACK - Force some whitespace to appease tidy -->
+<literallayout></literallayout>
+
+<warning><para>Do not yet remove the Binutils source and build directories.
+We'll need these directories again in the next chapter in the state they are in
+now.</para></warning>
+
+<!-- HACK - Force some whitespace to appease tidy -->
+<literallayout></literallayout>
+
+</sect2>
 
 </sect1>