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 @@ +   + Bzip2 Installation Dependencies 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 @@ -Contents of Bzip2 +   + +Descriptions Last checked against version &bzip2-contversion; -Program Files -bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff, bzegrep, -bzfgrep, bzgrep, bzip2, bzip2recover, bzless and bzmore - -Descriptions +Program files descriptions bunzip2 bunzip2 decompresses files that are compressed with @@ -28,7 +26,8 @@ bzip2 compressed files. 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 gzip utility) +and approaches the performance of the PPM family of statistical compressors. bzip2recover @@ -46,9 +45,7 @@ terminal, like more. -Library Files -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 +Library files descriptions libbz2 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 @@ &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 @@ - -Command explanations - -make CC="gcc -static -s": These flags instruct -gcc to statically link bzip2, without compiling symbols. - - - 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 @@ +   + Installation of Bzip2 -Install Bzip2 by running the following commands: +Since the Bzip2 package has no configure script we can't prepare it +for compilation. Instead we just run the make +program and start compiling, with a few variables changed to suit our +environment: -make CC="gcc -static -s" && +make CC="gcc -static -s" make PREFIX=$LFS/static install +The meaning of the make options are: + + + +CC="gcc -static -s": The Bzip2 package +does not honour the LDFLAGS variable, so instead we set +the CC variable which defines which compiler to use. +The -static option tells the compiler to link all +programs statically. + +PREFIX=$LFS/static: Instead of +passing a --prefix=$LFS/static to a configure script, +we set the PREFIX variable to accomplish the same goal +(since there is no configure script present). + + 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 @@ Estimated build time: &bzip2-time-static; Estimated required disk space: &bzip2-compsize-static; -&c5-bzip2-inst; -&c5-bzip2-exp; -&aa-bzip2-desc; +&aa-bzip2-shortdesc; &aa-bzip2-dep; +&c5-bzip2-inst; 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 @@ +