From 09fb7a09f1b6fc54c50658de94834b283d3e86fd Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Tue, 17 Jan 2006 20:43:10 +0000 Subject: Indenting chapter 05, part 2 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7281 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/coreutils.xml | 80 +++++++++------- chapter05/dejagnu.xml | 108 ++++++++++++--------- chapter05/diffutils.xml | 70 ++++++++------ chapter05/expect.xml | 243 +++++++++++++++++++++++++++--------------------- chapter05/findutils.xml | 71 ++++++++------ chapter05/flex.xml | 84 ++++++++++------- chapter05/gawk.xml | 80 ++++++++++------ 7 files changed, 439 insertions(+), 297 deletions(-) diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml index 062afa1dc..45eba0073 100644 --- a/chapter05/coreutils.xml +++ b/chapter05/coreutils.xml @@ -1,57 +1,73 @@ - %general-entities; ]> + -Coreutils-&coreutils-version; - + + + Coreutils-&coreutils-version; + + + Coreutils + tools + + + + -<indexterm zone="ch-tools-coreutils"> -<primary sortas="a-Coreutils">Coreutils</primary> -<secondary>tools</secondary></indexterm> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/coreutils.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> -<sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.9 SBU</seg><seg>53.3 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.9 SBU</seg> + <seg>53.3 MB</seg> + </seglistitem> + </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/coreutils.xml" + xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> -</sect2> + </sect2> -<sect2 role="installation"> -<title>Installation of Coreutils + + Installation of Coreutils -Prepare Coreutils for compilation: + Prepare Coreutils for compilation: ./configure --prefix=/tools -Compile the package: + Compile the package: make -To test the results, issue: -make RUN_EXPENSIVE_TESTS=yes check. The -RUN_EXPENSIVE_TESTS=yes parameter tells the -test suite to run several additional tests that are considered -relatively expensive (in terms of CPU power and memory usage) on some -platforms, but generally are not a problem on Linux. + To test the results, issue: + make RUN_EXPENSIVE_TESTS=yes check. The + RUN_EXPENSIVE_TESTS=yes parameter tells the + test suite to run several additional tests that are considered + relatively expensive (in terms of CPU power and memory usage) on some + platforms, but generally are not a problem on Linux. -Install the package: + Install the package: make install - + - -<para>Details on this package are located in <xref -linkend="contents-coreutils" role="."/></para> -</sect2> + <sect2 role="content"> + <title/> -</sect1> + <para>Details on this package are located in + <xref linkend="contents-coreutils" role="."/></para> + + </sect2> +</sect1> diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml index b185c3365..06957da9f 100644 --- a/chapter05/dejagnu.xml +++ b/chapter05/dejagnu.xml @@ -1,68 +1,92 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> %general-entities; ]> + <sect1 id="ch-tools-dejagnu" role="wrap"> -<title>DejaGNU-&dejagnu-version; - + + + DejaGNU-&dejagnu-version; + + + DejaGNU + + + + + + <para>The DejaGNU package contains a framework for testing other + programs.</para> -<indexterm zone="ch-tools-dejagnu"><primary sortas="a-DejaGNU">DejaGNU</primary></indexterm> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<sect2 role="package"><title/> -<para>The DejaGNU package contains a framework for testing other programs.</para> + <seglistitem> + <seg>0.1 SBU</seg> + <seg>6.1 MB</seg> + </seglistitem> + </segmentedlist> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.1 SBU</seg><seg>6.1 MB</seg></seglistitem> -</segmentedlist> + <segmentedlist> + <segtitle>&dependencies;</segtitle> -<segmentedlist> -<segtitle>&dependencies;</segtitle> -<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, -GCC, Glibc, Grep, Make, and Sed</seg></seglistitem> -</segmentedlist> -</sect2> + <seglistitem> + <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, + Make, and Sed</seg> + </seglistitem> + </segmentedlist> -<sect2 role="installation"> -<title>Installation of DejaGNU + -Prepare DejaGNU for compilation: + + Installation of DejaGNU + + Prepare DejaGNU for compilation: ./configure --prefix=/tools -Build and install the package: + Build and install the package: make install -To test the results, issue: make check. + To test the results, issue: + make check. - + -Contents of DejaGNU + + Contents of DejaGNU - -Installed program -runtest - + + Installed program -Short Descriptions - - + + runtest + + - -runtest - -A wrapper script that locates the proper -expect shell and then runs DejaGNU -runtest - - - + + Short Descriptions + + - + + runtest + + A wrapper script that locates the proper + expect shell and then runs DejaGNU + + runtest + + + - + + + + diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml index d20c51afc..a0ef9c878 100644 --- a/chapter05/diffutils.xml +++ b/chapter05/diffutils.xml @@ -1,52 +1,68 @@ - %general-entities; ]> + -Diffutils-&diffutils-version; - + + + Diffutils-&diffutils-version; + + + Diffutils + tools + + + + -<indexterm zone="ch-tools-diffutils"> -<primary sortas="a-Diffutils">Diffutils</primary> -<secondary>tools</secondary></indexterm> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/diffutils.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> -<sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.1 SBU</seg><seg>5.6 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.1 SBU</seg> + <seg>5.6 MB</seg> + </seglistitem> + </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/diffutils.xml" + xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> -</sect2> + </sect2> -<sect2 role="installation"> -<title>Installation of Diffutils + + Installation of Diffutils -Prepare Diffutils for compilation: + Prepare Diffutils for compilation: ./configure --prefix=/tools -Compile the package: + Compile the package: make -This package does not come with a test suite. + This package does not come with a test suite. -Install the package: + Install the package: make install - + - -<para>Details on this package are located in <xref -linkend="contents-diffutils" role="."/></para> -</sect2> + <sect2 role="content"> + <title/> -</sect1> + <para>Details on this package are located in + <xref linkend="contents-diffutils" role="."/></para> + + </sect2> +</sect1> diff --git a/chapter05/expect.xml b/chapter05/expect.xml index 32662380c..49a53b6b7 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -1,129 +1,164 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> %general-entities; ]> + <sect1 id="ch-tools-expect" role="wrap"> -<title>Expect-&expect-version; - + + + Expect-&expect-version; + + + Expect + + + + -<indexterm zone="ch-tools-expect"><primary sortas="a-Expect">Expect</primary></indexterm> + <para>The Expect package contains a program for carrying out scripted + dialogues with other interactive programs.</para> -<sect2 role="package"><title/> -<para>The Expect package contains a program for carrying out scripted dialogues -with other interactive programs.</para> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.1 SBU</seg><seg>4.0 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.1 SBU</seg> + <seg>4.0 MB</seg> + </seglistitem> + </segmentedlist> -<segmentedlist> -<segtitle>&dependencies;</segtitle> -<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, -GCC, Glibc, Grep, Make, Sed, and Tcl</seg></seglistitem> -</segmentedlist> -</sect2> + <segmentedlist> + <segtitle>&dependencies;</segtitle> -<sect2 role="installation"> -<title>Installation of Expect + + Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make, + Sed, and Tcl + + -First, fix a bug that can result in false failures during the GCC test -suite run: + + + + Installation of Expect + + First, fix a bug that can result in false failures during the GCC test + suite run: patch -Np1 -i ../&expect-spawn-patch; -Now prepare Expect for compilation: + Now prepare Expect for compilation: ./configure --prefix=/tools --with-tcl=/tools/lib \ - --with-tclinclude=/tools/include --with-x=no - -The meaning of the configure options: - - - ---with-tcl=/tools/lib -This ensures that the configure script finds the Tcl installation in -the temporary tools location instead of possibly locating an existing -one on the host system. - - - ---with-tclinclude=/tools/include -This explicitly tells Expect where to find Tcl's internal headers. -Using this option avoids conditions where configure fails because -it cannot automatically discover the location of Tcl's headers. - - - ---with-x=no -This tells the configure script not to search for Tk -(the Tcl GUI component) or the X Window System libraries, both of -which may reside on the host system but will not exist in the temporary -environment. - - - -Build the package: + --with-tclinclude=/tools/include --with-x=no + + + The meaning of the configure options: + + + --with-tcl=/tools/lib + + This ensures that the configure script finds the Tcl + installation in the temporary tools location instead of possibly + locating an existing one on the host system. + + + + + --with-tclinclude=/tools/include + + This explicitly tells Expect where to find Tcl's internal + headers. Using this option avoids conditions where + configure fails because it cannot automatically + discover the location of Tcl's headers. + + + + + --with-x=no + + This tells the configure script not to search for Tk (the + Tcl GUI component) or the X Window System libraries, both of which + may reside on the host system but will not exist in the temporary + environment. + + + + + + Build the package: make -To test the results, issue: make test. -Note that the Expect test suite is known to experience failures under -certain host conditions that are not within our control. Therefore, -test suite failures here are not surprising and are not considered -critical. + To test the results, issue: make test. + Note that the Expect test suite is known to experience failures under + certain host conditions that are not within our control. Therefore, + test suite failures here are not surprising and are not considered + critical. -Install the package: + Install the package: make SCRIPTS="" install -The meaning of the make parameter: - - - -SCRIPTS="" -This prevents installation of the supplementary expect -scripts, which are not needed. - - - - - -Contents of Expect - - -Installed program -Installed library -expectlibexpect-&expect-lib-version;.a - - -Short Descriptions - - - - -expect - -Communicates with other interactive -programs according to a script -expect - - - - -libexpect-&expect-lib-version;.a - -Contains functions that allow Expect to be used as a Tcl extension or to -be used directly from C or C++ (without Tcl) -libexpect-&expect-lib-version; - - - - - + + The meaning of the make parameter: + + + SCRIPTS="" + + This prevents installation of the supplementary Expect + scripts, which are not needed. + + + + + + + + + Contents of Expect + + + Installed program + Installed library + + + expect + libexpect-&expect-lib-version;.a + + + + + Short Descriptions + + + + + expect + + Communicates with other interactive programs according + to a script + + expect + + + + + + libexpect-&expect-lib-version;.a + + Contains functions that allow Expect to be used as a Tcl + extension or to be used directly from C or C++ (without Tcl) + + libexpect-&expect-lib-version; + + + + + + + - diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml index b360e759e..a5812aa19 100644 --- a/chapter05/findutils.xml +++ b/chapter05/findutils.xml @@ -1,52 +1,69 @@ - %general-entities; ]> + -Findutils-&findutils-version; - + + + Findutils-&findutils-version; + + + Findutils + tools + + + + -<indexterm zone="ch-tools-findutils"> -<primary sortas="a-Findutils">Findutils</primary> -<secondary>tools</secondary></indexterm> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/findutils.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> -<sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.2 SBU</seg><seg>8.9 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.2 SBU</seg> + <seg>8.9 MB</seg> + </seglistitem> + </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/findutils.xml" + xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> -</sect2> + </sect2> -<sect2 role="installation"> -<title>Installation of Findutils + + Installation of Findutils -Prepare Findutils for compilation: + Prepare Findutils for compilation: ./configure --prefix=/tools -Compile the package: + Compile the package: make -To test the results, issue: make check. + To test the results, issue: + make check. -Install the package: + Install the package: make install - + - -<para>Details on this package are located in <xref -linkend="contents-findutils" role="."/></para> -</sect2> + <sect2 role="content"> + <title/> -</sect1> + <para>Details on this package are located in + <xref linkend="contents-findutils" role="."/></para> + + </sect2> +</sect1> diff --git a/chapter05/flex.xml b/chapter05/flex.xml index d5813dfa2..8dc7eba5a 100644 --- a/chapter05/flex.xml +++ b/chapter05/flex.xml @@ -1,65 +1,81 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> %general-entities; ]> + <sect1 id="ch-tools-flex" role="wrap"> -<title>Flex-&flex-version; - + + + Flex-&flex-version; + + + Flex + tools + + + + -<indexterm zone="ch-tools-flex"> -<primary sortas="a-Flex">Flex</primary> -<secondary>tools</secondary></indexterm> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/flex.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> -<sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.6 SBU</seg><seg>22.5 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.6 SBU</seg> + <seg>22.5 MB</seg> + </seglistitem> + </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/flex.xml" + xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> -</sect2> + </sect2> -<sect2 role="installation"> -<title>Installation of Flex + + Installation of Flex -Flex contains several known bugs. These can be fixed with the -following patch: + Flex contains several known bugs. These can be fixed with the + following patch: patch -Np1 -i ../&flex-fixes-patch; -The GNU autotools will detect that the Flex source code has been -modified by the previous patch and tries to update the man page -accordingly. This does not work on many systems, and the default page is -fine, so make sure it does not get regenerated: + The GNU autotools will detect that the Flex source code has been + modified by the previous patch and tries to update the man page + accordingly. This does not work on many systems, and the default page is + fine, so make sure it does not get regenerated: touch doc/flex.1 -Now prepare Flex for compilation: + Now prepare Flex for compilation: ./configure --prefix=/tools -Compile the package: + Compile the package: make -To test the results, issue: -make check. + To test the results, issue: + make check. -Install the package: + Install the package: make install - + - -<para>Details on this package are located in <xref -linkend="contents-flex" role="."/></para> -</sect2> + <sect2 role="content"> + <title/> -</sect1> + <para>Details on this package are located in + <xref linkend="contents-flex" role="."/></para> + + </sect2> +</sect1> diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml index cca7101fc..fce5b6732 100644 --- a/chapter05/gawk.xml +++ b/chapter05/gawk.xml @@ -1,61 +1,79 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> %general-entities; ]> + <sect1 id="ch-tools-gawk" role="wrap"> -<title>Gawk-&gawk-version; - + + + Gawk-&gawk-version; + + + Gawk + tools + + + + -<indexterm zone="ch-tools-gawk"> -<primary sortas="a-Gawk">Gawk</primary> -<secondary>tools</secondary></indexterm> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/gawk.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> -<sect2 role="package"><title/> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> -<segmentedlist> -<segtitle>&buildtime;</segtitle> -<segtitle>&diskspace;</segtitle> -<seglistitem><seg>0.2 SBU</seg><seg>16.4 MB</seg></seglistitem> -</segmentedlist> + <seglistitem> + <seg>0.2 SBU</seg> + <seg>16.4 MB</seg> + </seglistitem> + </segmentedlist> -<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/gawk.xml" + xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/> -</sect2> + </sect2> -<sect2 role="installation"> -<title>Installation of Gawk + + Installation of Gawk -Prepare Gawk for compilation: + Prepare Gawk for compilation: ./configure --prefix=/tools -Due to a bug in the configure script, Gawk fails -to detect certain aspects of locale support in Glibc. This -bug leads to, e.g., Gettext testsuite failures. Work around this issue -by appending the missing macro definitions to config.h: + Due to a bug in the configure script, Gawk fails + to detect certain aspects of locale support in Glibc. This bug leads to, + e.g., Gettext testsuite failures. Work around this issue by appending the + missing macro definitions to config.h: + cat >>config.h <<"EOF" #define HAVE_LANGINFO_CODESET 1 #define HAVE_LC_MESSAGES 1 EOF -Compile the package: + Compile the package: make -To test the results, issue: make check. + To test the results, issue: + make check. -Install the package: + Install the package: make install - + - -<para>Details on this package are located in <xref -linkend="contents-gawk" role="."/></para> -</sect2> + <sect2 role="content"> + <title/> -</sect1> + <para>Details on this package are located in + <xref linkend="contents-gawk" role="."/></para> + </sect2> + +</sect1> -- cgit v1.2.3-54-g00ecf