diff options
| -rw-r--r-- | appendixa/findutils-dep.xml | 2 | ||||
| -rw-r--r-- | appendixa/findutils-desc.xml | 10 | ||||
| -rw-r--r-- | appendixa/findutils-shortdesc.xml | 17 | ||||
| -rw-r--r-- | appendixa/findutils.xml | 1 | ||||
| -rw-r--r-- | chapter05/findutils-exp.xml | 9 | ||||
| -rw-r--r-- | chapter05/findutils-inst.xml | 19 | ||||
| -rw-r--r-- | chapter05/findutils.xml | 5 | ||||
| -rw-r--r-- | entities/findutils.ent | 1 |
8 files changed, 39 insertions, 25 deletions
diff --git a/appendixa/findutils-dep.xml b/appendixa/findutils-dep.xml index 419169099..1539cb6d7 100644 --- a/appendixa/findutils-dep.xml +++ b/appendixa/findutils-dep.xml @@ -1,3 +1,5 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Findutils Installation Dependencies</title> diff --git a/appendixa/findutils-desc.xml b/appendixa/findutils-desc.xml index c65d63def..c74dcb11d 100644 --- a/appendixa/findutils-desc.xml +++ b/appendixa/findutils-desc.xml @@ -1,12 +1,10 @@ -<sect2><title>Contents of Findutils</title> +<sect2><title> </title><para> </para></sect2> -<para>Last checked against version &findutils-contversion;.</para> +<sect2><title>Descriptions</title> -<sect3><title>Program Files</title> -<para>bigram, code, find, frcode, locate, updatedb and -xargs</para></sect3> +<para>Last checked against version &findutils-contversion;.</para> -<sect3><title>Descriptions</title> +<sect3><title>Program files descriptions</title> <sect4><title>bigram</title> <para>bigram is used together with code to produce older-style locate diff --git a/appendixa/findutils-shortdesc.xml b/appendixa/findutils-shortdesc.xml new file mode 100644 index 000000000..db05045b5 --- /dev/null +++ b/appendixa/findutils-shortdesc.xml @@ -0,0 +1,17 @@ +<sect2><title>Contents of Findutils</title> + +<para>Last checked against version &findutils-contversion;.</para> + +<para>The Findutils package contains programs to find files, either +on-the-fly (by doing a live recursive search through directories and only +showing files that match the specifications) or by searching through a +database.</para> + +<para>Findutils installs the following:</para> + +<sect3><title>Program Files</title> +<para>bigram, code, find, frcode, locate, updatedb and +xargs</para></sect3> + +</sect2> + diff --git a/appendixa/findutils.xml b/appendixa/findutils.xml index 7dcc9e45e..7d9b40e6e 100644 --- a/appendixa/findutils.xml +++ b/appendixa/findutils.xml @@ -3,6 +3,7 @@ <?dbhtml filename="findutils.html" dir="appendixa"?> &aa-findutils-down; +&aa-findutils-shortdesc; &aa-findutils-desc; &aa-findutils-dep; diff --git a/chapter05/findutils-exp.xml b/chapter05/findutils-exp.xml deleted file mode 100644 index 174cf2db7..000000000 --- a/chapter05/findutils-exp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<sect2> -<title>Command explanations</title> - -<para><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput>: This -patch is to fix some compilation errors by -avoiding a variable conflict and changing some bad syntax.</para> - -</sect2> - diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml index d49a3db16..df3da659a 100644 --- a/chapter05/findutils-inst.xml +++ b/chapter05/findutils-inst.xml @@ -1,15 +1,20 @@ +<sect2><title> </title><para> </para></sect2> + <sect2> <title>Installing Findutils</title> -<para>This package requires its patch to be applied before you can -install it.</para> +<para>The Findutils package is quite old and it has problems compiling +against newer Glibc versions (Glibc-2.0.x and up). You need to apply the +patch that fixes some variable conflicts you'd otherwise end up +with:</para> + +<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch</userinput></screen></para> -<para>Install Findutils by running the following commands:</para> +<para>Install Findutils by running the following:</para> -<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch && -CPPFLAGS="-Dre_max_failures=re_max_failures2" \ - LDFLAGS="-static" ./configure --prefix=$LFS/static && -make && +<para><screen><userinput>CPPFLAGS="-Dre_max_failures=re_max_failures2" \ + LDFLAGS="-static" ./configure --prefix=$LFS/static +make make install</userinput></screen></para> </sect2> diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml index dad29df27..0ecaae958 100644 --- a/chapter05/findutils.xml +++ b/chapter05/findutils.xml @@ -5,10 +5,9 @@ <screen>Estimated build time: &findutils-time-static; Estimated required disk space: &findutils-compsize-static;</screen> -&c5-findutils-inst; -&c5-findutils-exp; -&aa-findutils-desc; +&aa-findutils-shortdesc; &aa-findutils-dep; +&c5-findutils-inst; </sect1> diff --git a/entities/findutils.ent b/entities/findutils.ent index 04b8f24ca..45c581199 100644 --- a/entities/findutils.ent +++ b/entities/findutils.ent @@ -11,6 +11,7 @@ <!ENTITY c6-findutils-inst SYSTEM "../chapter06/findutils-inst.xml"> <!ENTITY aa-findutils SYSTEM "../appendixa/findutils.xml"> +<!ENTITY aa-findutils-shortdesc SYSTEM "../appendixa/findutils-shortdesc.xml"> <!ENTITY aa-findutils-desc SYSTEM "../appendixa/findutils-desc.xml"> <!ENTITY aa-findutils-dep SYSTEM "../appendixa/findutils-dep.xml"> <!ENTITY aa-findutils-down SYSTEM "../appendixa/findutils-down.xml"> |