Browse Source

rewrote bash install page

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2306 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Gerard Beekmans 22 năm trước cách đây
mục cha
commit
1bbb24b645

+ 3 - 11
appendixa/binutils-desc.xml

@@ -1,13 +1,8 @@
-<sect2><title>Contents of Binutils</title>
+<sect2><title>Descriptions</title>
 
 
 <para>Last checked against version &binutils-contversion;.</para>
 <para>Last checked against version &binutils-contversion;.</para>
 
 
-<sect3><title>Program Files</title>
-
-<para>addr2line, ar, as, gprof, ld, nm, objcopy, objdump, 
-ranlib, readelf, size, strings and strip</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Program files descriptions</title>
 
 
 <sect4><title>addr2line</title>
 <sect4><title>addr2line</title>
 <para>addr2line translates program addresses into file names and line numbers. 
 <para>addr2line translates program addresses into file names and line numbers. 
@@ -79,10 +74,7 @@ modified copies under different names.</para></sect4>
 
 
 </sect3>
 </sect3>
 
 
-<sect3><title>Library Files</title>
-<para>libbfd.[a,so] and libopcodes.[a,so]</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library files descriptions</title>
 
 
 <sect4><title>libbfd</title>
 <sect4><title>libbfd</title>
 <para>libbfd is the Binary File Descriptor library.</para></sect4>
 <para>libbfd is the Binary File Descriptor library.</para></sect4>

+ 20 - 0
appendixa/binutils-shortdesc.xml

@@ -0,0 +1,20 @@
+<sect2><title>Contents of Binutils</title>
+
+<para>Last checked against version &binutils-contversion;.</para>
+
+<para>Binutils is a collection of software development tools containing a
+linker, assembler and other tools to work with object files and
+archives.</para>
+
+<para>Binutils installs the following files:</para>
+
+<sect3><title>Program Files</title>
+
+<para>addr2line, ar, as, gprof, ld, nm, objcopy, objdump, 
+ranlib, readelf, size, strings and strip</para></sect3>
+
+<sect3><title>Library Files</title>
+<para>libbfd.[a,so] and libopcodes.[a,so]</para></sect3>
+
+</sect2>
+

+ 1 - 0
appendixa/binutils.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="binutils.html" dir="appendixa"?>
 <?dbhtml filename="binutils.html" dir="appendixa"?>
 
 
 &aa-binutils-down;
 &aa-binutils-down;
+&aa-binutils-shortdesc;
 &aa-binutils-desc;
 &aa-binutils-desc;
 &aa-binutils-dep;
 &aa-binutils-dep;
 
 

+ 0 - 18
chapter05/binutils-exp.xml

@@ -1,18 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>mkdir ../binutils-build:</userinput> The installation
-instructions for Binutils recommend creating a separate build directory
-instead of compiling the package inside the source tree. So, we create a
-binutils-build directory and work from there.</para>
-
-<para><userinput>--disable-nls:</userinput> This option disables
-internationalization (also known as i18n). We don't need this for our
-static programs and nls often causes problems when you're linking
-statically.</para>
-
-<para><userinput>LDFLAGS="-all-static":</userinput> Setting the variable LDFLAGS
-to the value -all-static causes binutils to be linked statically.</para>
-
-</sect2>
-

+ 28 - 5
chapter05/binutils-inst.xml

@@ -8,14 +8,37 @@ that override default optimizations, such as CFLAGS and CXXFLAGS, we
 recommend unsetting or modifying them when building binutils. You have been
 recommend unsetting or modifying them when building binutils. You have been
 warned.</para>
 warned.</para>
 
 
-<para>Install Binutils by running the following commands:</para>
+<para>It is recommended by the Binutils installation documentation to build
+Binutils outside of the source directory in a dedicated directory:</para>
 
 
+<para><screen><userinput>mkdir ../binutils-build
+cd ../binutils-build</userinput></screen></para>
 
 
-<para><screen><userinput>mkdir ../binutils-build &amp;&amp;
-cd ../binutils-build &amp;&amp;
-../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make LDFLAGS="-all-static" &amp;&amp;
+<para>Next, prepare Binutils to be compiled:</para>
+
+<para><screen><userinput>../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls</userinput></screen></para>
+
+<para>The meaning of the (new) configure switches are:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--disable-nls:</userinput> This option disables
+internationalization (also known as i18n). We don't need this for our
+static programs and nls often causes problems when you're linking
+statically.</para></listitem>
+</itemizedlist>
+
+<para>We'll finish off by compiling and installing the package:</para>
+
+<para><screen><userinput>make LDFLAGS="-all-static" &amp;&amp;
 make install</userinput></screen></para>
 make install</userinput></screen></para>
 
 
+<para><emphasis>make LDFLAGS="-all-static"</emphasis> is how we tell
+Binutils that all programs should be statically linked. Setting the
+<emphasis>LDFLAGS</emphasis> variable is the common way of specifying we
+want a static link to take place, however, its value and the way it is set
+is not always the same. You'll see with the remaining packages that there
+are different ways of setting up the <emphasis>LDFLAGS</emphasis>
+variable.</para>
+
 </sect2>
 </sect2>
 
 

+ 2 - 3
chapter05/binutils.xml

@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &binutils-time-static;
 <screen>Estimated build time:           &binutils-time-static;
 Estimated required disk space:  &binutils-compsize-static;</screen>
 Estimated required disk space:  &binutils-compsize-static;</screen>
 
 
-&c5-binutils-inst;
-&c5-binutils-exp;
-&aa-binutils-desc;
+&aa-binutils-shortdesc;
 &aa-binutils-dep;
 &aa-binutils-dep;
+&c5-binutils-inst;
 
 
 </sect1>
 </sect1>
 
 

+ 1 - 0
entities/binutils.ent

@@ -9,6 +9,7 @@
 <!ENTITY c6-binutils-exp SYSTEM "../chapter06/binutils-exp.xml">
 <!ENTITY c6-binutils-exp SYSTEM "../chapter06/binutils-exp.xml">
 
 
 <!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml">
 <!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml">
+<!ENTITY aa-binutils-shortdesc SYSTEM "../appendixa/binutils-shortdesc.xml">
 <!ENTITY aa-binutils-desc SYSTEM "../appendixa/binutils-desc.xml">
 <!ENTITY aa-binutils-desc SYSTEM "../appendixa/binutils-desc.xml">
 <!ENTITY aa-binutils-dep SYSTEM "../appendixa/binutils-dep.xml">
 <!ENTITY aa-binutils-dep SYSTEM "../appendixa/binutils-dep.xml">
 <!ENTITY aa-binutils-down SYSTEM "../appendixa/binutils-down.xml">
 <!ENTITY aa-binutils-down SYSTEM "../appendixa/binutils-down.xml">