diff options
| -rw-r--r-- | appendixa/bzip2-dep.xml | 2 | ||||
| -rw-r--r-- | appendixa/bzip2-desc.xml | 17 | ||||
| -rw-r--r-- | appendixa/bzip2.xml | 1 | ||||
| -rw-r--r-- | chapter05/bzip2-exp.xml | 8 | ||||
| -rw-r--r-- | chapter05/bzip2-inst.xml | 25 | ||||
| -rw-r--r-- | chapter05/bzip2.xml | 5 | ||||
| -rw-r--r-- | entities/bzip2.ent | 1 |
7 files changed, 36 insertions, 23 deletions
diff --git a/appendixa/bzip2-dep.xml b/appendixa/bzip2-dep.xml index a2dec9902..a68ffd0f0 100644 --- a/appendixa/bzip2-dep.xml +++ b/appendixa/bzip2-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Bzip2 Installation Dependencies</title> diff --git a/appendixa/bzip2-desc.xml b/appendixa/bzip2-desc.xml index 106a195a3..7fd45ffe7 100644 --- a/appendixa/bzip2-desc.xml +++ b/appendixa/bzip2-desc.xml @@ -1,12 +1,10 @@ -<sect2><title>Contents of Bzip2</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &bzip2-contversion;</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff, bzegrep, -bzfgrep, bzgrep, bzip2, bzip2recover, bzless and bzmore</para></sect3> +<para>Last checked against version &bzip2-contversion;</para> -<sect3><title>Descriptions</title> +<sect3><title>Program files descriptions</title> <sect4><title>bunzip2</title> <para>bunzip2 decompresses files that are compressed with @@ -28,7 +26,8 @@ bzip2 compressed files.</para></sect4> <para>bzip2 compresses files using the Burrows-Wheeler block sorting text compression algorithm and Huffman coding. Compression is generally considerably better than that achieved by more conventional LZ77/LZ78-based -compressors and approaches the performance of the PPM family of statistical +compressors (such as the traditional <userinput>gzip</userinput> utility) +and approaches the performance of the PPM family of statistical compressors.</para></sect4> <sect4><title>bzip2recover</title> @@ -46,9 +45,7 @@ terminal, like more.</para></sect4> </sect3> -<sect3><title>Library Files</title> -<para>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to -libbz2.so.1.0.2) and libbz2.so.1.0.2</para> +<sect3><title>Library files descriptions</title> <sect4><title>libbz2</title> <para>libbz2 is the library for implementing lossless, block-sorting data diff --git a/appendixa/bzip2.xml b/appendixa/bzip2.xml index 336710e8f..a78fba2d4 100644 --- a/appendixa/bzip2.xml +++ b/appendixa/bzip2.xml @@ -3,6 +3,7 @@ <?dbhtml filename="bzip2.html" dir="appendixa"?> &aa-bzip2-down; +&aa-bzip2-shortdesc; &aa-bzip2-desc; &aa-bzip2-dep; diff --git a/chapter05/bzip2-exp.xml b/chapter05/bzip2-exp.xml deleted file mode 100644 index c6350d66c..000000000 --- a/chapter05/bzip2-exp.xml +++ /dev/null @@ -1,8 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>make CC="gcc -static -s": </userinput>These flags instruct -gcc to statically link bzip2, without compiling symbols.</para> - -</sect2> - diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index d913d4ad8..f6f8183c2 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -1,10 +1,31 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installation of Bzip2</title> -<para>Install Bzip2 by running the following commands:</para> +<para>Since the Bzip2 package has no configure script we can't prepare it +for compilation. Instead we just run the <userinput>make</userinput> +program and start compiling, with a few variables changed to suit our +environment:</para> -<para><screen><userinput>make CC="gcc -static -s" && +<para><screen><userinput>make CC="gcc -static -s" make PREFIX=$LFS/static install</userinput></screen></para> +<para>The meaning of the make options are:</para> + +<itemizedlist> + +<listitem><para><userinput>CC="gcc -static -s":</userinput> The Bzip2 package +does not honour the <emphasis>LDFLAGS</emphasis> variable, so instead we set +the <emphasis>CC</emphasis> variable which defines which compiler to use. +The <emphasis>-static</emphasis> option tells the compiler to link all +programs statically.</para></listitem> + +<listitem><para><userinput>PREFIX=$LFS/static:</userinput> Instead of +passing a <emphasis>--prefix=$LFS/static</emphasis> to a configure script, +we set the <emphasis>PREFIX</emphasis> variable to accomplish the same goal +(since there is no configure script present).</para></listitem> +</itemizedlist> + </sect2> diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml index 04262f0c5..296bfec6b 100644 --- a/chapter05/bzip2.xml +++ b/chapter05/bzip2.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &bzip2-time-static; Estimated required disk space: &bzip2-compsize-static;</screen> -&c5-bzip2-inst; -&c5-bzip2-exp; -&aa-bzip2-desc; +&aa-bzip2-shortdesc; &aa-bzip2-dep; +&c5-bzip2-inst; </sect1> diff --git a/entities/bzip2.ent b/entities/bzip2.ent index e0637185c..59ca7a265 100644 --- a/entities/bzip2.ent +++ b/entities/bzip2.ent @@ -9,6 +9,7 @@ <!ENTITY c6-bzip2-exp SYSTEM "../chapter06/bzip2-exp.xml"> <!ENTITY aa-bzip2 SYSTEM "../appendixa/bzip2.xml"> +<!ENTITY aa-bzip2-shortdesc SYSTEM "../appendixa/bzip2-shortdesc.xml"> <!ENTITY aa-bzip2-desc SYSTEM "../appendixa/bzip2-desc.xml"> <!ENTITY aa-bzip2-dep SYSTEM "../appendixa/bzip2-dep.xml"> <!ENTITY aa-bzip2-down SYSTEM "../appendixa/bzip2-down.xml"> |